Skip to content
This repository was archived by the owner on Mar 3, 2020. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 2 additions & 17 deletions lib/capybara_webkit_builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,32 +16,17 @@ def qmake_bin
ENV['QMAKE'] || default_qmake_binary
end

def spec
ENV['SPEC'] || os_spec
end

def default_qmake_binary
case RbConfig::CONFIG['host_os']
when /freebsd/
"qmake-qt4"
when /openbsd/
"qmake-qt5"
else
"qmake"
end
end

def os_spec
case RbConfig::CONFIG['host_os']
when /linux/
"linux-g++"
when /freebsd/
"freebsd-g++"
when /mingw32/
"win32-g++"
else
"macx-g++"
end
end

def sh(command)
system(command)
success = $?.exitstatus == SUCCESS_STATUS
Expand Down
1 change: 1 addition & 0 deletions src/StdinNotifier.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "StdinNotifier.h"

#include <QTcpServer>
#include <iostream>

StdinNotifier::StdinNotifier(QObject *parent) : QObject(parent) {
m_notifier = new QSocketNotifier(fileno(stdin), QSocketNotifier::Read, this);
Expand Down
1 change: 1 addition & 0 deletions src/StdinNotifier.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include <QObject>

class QSocketNotifier;
#include <QSocketNotifier>
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's #include <QSocketNotifier> in the .cpp file instead.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup, that also works.


class StdinNotifier : public QObject {
Q_OBJECT
Expand Down
1 change: 1 addition & 0 deletions src/WebPage.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#ifndef _WEBPAGE_H
#define _WEBPAGE_H
#include <QtGlobal>
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
#include <QtWebKitWidgets>
#else
Expand Down