github-migration/jasmine-headless-webkit
1
0
Fork 0
Code Issues 39 Pull Requests 16 Packages Projects Releases Wiki Activity

Won't run and compile with qt5. #178

Open
petRUShka wants to merge 3 commits from petRUShka/master into master
pull from: petRUShka/master
merge into: github-migration:master
Conversation 1 Commits 3 Files Changed 5 +10 -2
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5e92fc2d04 - Show all commits

6
ext/jasmine-webkit-specrunner/Page.h
View File

@ -2,7 +2,11 @@
#define JHW_PAGE #define JHW_PAGE
#include <QtGui> #include <QtGui>
#include <QtWebKit> #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
#include <QtWebKitWidgets>
#else
#include <QtWebKit>
#endif
class Page: public QWebPage { class Page: public QWebPage {
Q_OBJECT Q_OBJECT

6
ext/jasmine-webkit-specrunner/Runner.h
View File

@ -2,7 +2,11 @@
#define JHW_RUNNER #define JHW_RUNNER
#include <QtGui> #include <QtGui>
#include <QtWebKit> #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
#include <QtWebKitWidgets>
#else
#include <QtWebKit>
#endif
#include <QFile> #include <QFile>
#include <QTextStream> #include <QTextStream>
#include <iostream> #include <iostream>