diff --git a/ext/jasmine-webkit-specrunner/Page.cpp b/ext/jasmine-webkit-specrunner/Page.cpp index cdfa396..b49ba2c 100644 --- a/ext/jasmine-webkit-specrunner/Page.cpp +++ b/ext/jasmine-webkit-specrunner/Page.cpp @@ -1,7 +1,4 @@ -#include -#include #include - #include "Page.h" Page::Page() : QWebPage() {} diff --git a/ext/jasmine-webkit-specrunner/Page.h b/ext/jasmine-webkit-specrunner/Page.h index bae094d..a78eafe 100644 --- a/ext/jasmine-webkit-specrunner/Page.h +++ b/ext/jasmine-webkit-specrunner/Page.h @@ -2,7 +2,11 @@ #define JHW_PAGE #include -#include +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) + #include +#else + #include +#endif class Page: public QWebPage { Q_OBJECT diff --git a/ext/jasmine-webkit-specrunner/Runner.cpp b/ext/jasmine-webkit-specrunner/Runner.cpp index 66943a5..988bb58 100644 --- a/ext/jasmine-webkit-specrunner/Runner.cpp +++ b/ext/jasmine-webkit-specrunner/Runner.cpp @@ -1,11 +1,3 @@ -#include -#include -#include -#include -#include -#include -#include - #include "Runner.h" #include "Page.h" diff --git a/ext/jasmine-webkit-specrunner/Runner.h b/ext/jasmine-webkit-specrunner/Runner.h index 3f1f01b..57afb4a 100644 --- a/ext/jasmine-webkit-specrunner/Runner.h +++ b/ext/jasmine-webkit-specrunner/Runner.h @@ -1,8 +1,6 @@ #ifndef JHW_RUNNER #define JHW_RUNNER -#include -#include #include #include #include diff --git a/ext/jasmine-webkit-specrunner/common.pri b/ext/jasmine-webkit-specrunner/common.pri index b80fe37..4c4e6f7 100644 --- a/ext/jasmine-webkit-specrunner/common.pri +++ b/ext/jasmine-webkit-specrunner/common.pri @@ -1,7 +1,12 @@ TEMPLATE = app CONFIG -= app_bundle QMAKE_INFO_PLIST = Info.plist -QT += network webkit +QT += network +greaterThan(QT_MAJOR_VERSION, 4) { + QT += webkitwidgets +} else { + QT += webkit +} SOURCES = Page.cpp Runner.cpp HEADERS = Page.h Runner.h