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 +11 -15
5 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ext/jasmine-webkit-specrunner/Page.cpp
View File

@ -1,7 +1,4 @@
#include <QtGui>
#include <QtWebKit>
#include <iostream> #include <iostream>
#include "Page.h" #include "Page.h"
Page::Page() : QWebPage() {} Page::Page() : QWebPage() {}

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

8
ext/jasmine-webkit-specrunner/Runner.cpp
View File

@ -1,11 +1,3 @@
#include <QtGui>
#include <QtWebKit>
#include <QFile>
#include <QTextStream>
#include <iostream>
#include <sstream>
#include <QQueue>
#include "Runner.h" #include "Runner.h"
#include "Page.h" #include "Page.h"

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

@ -1,8 +1,6 @@
#ifndef JHW_RUNNER #ifndef JHW_RUNNER
#define JHW_RUNNER #define JHW_RUNNER
#include <QtGui>
#include <QtWebKit>
#include <QFile> #include <QFile>
#include <QTextStream> #include <QTextStream>
#include <iostream> #include <iostream>

7
ext/jasmine-webkit-specrunner/common.pri
View File

@ -1,7 +1,12 @@
TEMPLATE = app TEMPLATE = app
CONFIG -= app_bundle CONFIG -= app_bundle
QMAKE_INFO_PLIST = Info.plist 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 SOURCES = Page.cpp Runner.cpp
HEADERS = Page.h Runner.h HEADERS = Page.h Runner.h