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 +6 -1
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f80499ecd8 - Show all commits

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