Won't run and compile with qt5. #178

Open
petRUShka wants to merge 3 commits from petRUShka/master into master
5 changed files with 11 additions and 15 deletions

View File

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

View File

@ -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

View File

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

View File

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

View File

@ -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