Fix: don't include Qt5 webkit widget headers

Fix: some headers cleanup
Fix: add QT5 support
2013-04-10 11:58:20 +04:00 · 2013-04-10 11:30:26 +04:00 · 2013-04-10 11:22:24 +04:00
6 changed files with 12 additions and 16 deletions
--- a/README.md
+++ b/README.md
@ -1,4 +1,4 @@
-_This project is dead. You should use [Karma](http://karma-runner.github.io/) instead. I do._
+_I am looking for a new maintainer for this project. Please contact me via GitHub if you're interested._

 # Jasmine Headless WebKit runner

--- a/ext/jasmine-webkit-specrunner/Page.cpp
+++ b/ext/jasmine-webkit-specrunner/Page.cpp
@ -1,7 +1,4 @@
-#include <QtGui>
-#include <QtWebKit>
 #include <iostream>
-
 #include "Page.h"

 Page::Page() : QWebPage() {}
--- a/ext/jasmine-webkit-specrunner/Page.h
+++ b/ext/jasmine-webkit-specrunner/Page.h
@ -2,7 +2,11 @@
 #define JHW_PAGE

 #include <QtGui>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+  #include <QtWebKitWidgets>
+#else
  #include <QtWebKit>
+#endif

 class Page: public QWebPage {
  Q_OBJECT
--- a/ext/jasmine-webkit-specrunner/Runner.cpp
+++ b/ext/jasmine-webkit-specrunner/Runner.cpp
@ -1,11 +1,3 @@
-#include <QtGui>
-#include <QtWebKit>
-#include <QFile>
-#include <QTextStream>
-#include <iostream>
-#include <sstream>
-#include <QQueue>
-
 #include "Runner.h"
 #include "Page.h"

--- 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 <QtGui>
-#include <QtWebKit>
 #include <QFile>
 #include <QTextStream>
 #include <iostream>
--- 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
Author	SHA1	Message	Date
petrushka	f80499ecd8	Fix: don't include Qt5 webkit widget headers	2013-04-10 11:58:20 +04:00
petrushka	6013dad62b	Fix: some headers cleanup	2013-04-10 11:30:26 +04:00
petrushka	5e92fc2d04	Fix: add QT5 support	2013-04-10 11:22:24 +04:00