Allow Qt 5.6 with QtWebKit module

If users compiled or otherwise installed the webkit module, this allows
them to use capybara-webkit with Qt 5.6.

If they're using Qt 5.6 but don't have the module, this prints a
friendlier error message.
This commit is contained in:
Joe Ferris 2016-04-14 10:26:08 -04:00
parent a13a6b300c
commit 0af3c34aa6
2 changed files with 6 additions and 5 deletions

View File

@ -176,10 +176,11 @@ SOURCES = \
RESOURCES = webkit_server.qrc
QT += network
greaterThan(QT_MAJOR_VERSION, 4) {
greaterThan(QT_MAJOR_VERSION, 5) | greaterThan(QT_MINOR_VERSION, 5) {
error(capybara-webkit does not support Qt versions greater than 5.5)
}
QT += webkitwidgets
qtHaveModule(webkitwidgets) {
QT += webkitwidgets
} else {
error("No QtWebKit installation found. QtWebKit is no longer included with Qt 5.6, so you may need to install it separately.")
}
} else {
QT += webkit
}

View File

@ -1,5 +1,5 @@
SOURCES = testignoredebugoutput.cpp
OBJECTS += ../src/IgnoreDebugOutput.o
OBJECTS += ../src/build/IgnoreDebugOutput.o
QT += testlib
CONFIG += testcase console
CONFIG -= app_bundle