summaryrefslogtreecommitdiffstats
path: root/qtwebkit.pri
diff options
context:
space:
mode:
authorMarius Storm-Olsen <marius.storm-olsen@nokia.com>2012-03-08 14:34:10 -0600
committerQt by Nokia <qt-info@nokia.com>2012-03-09 12:31:24 +0100
commit8703d56ab239074faec026184734308661fa4332 (patch)
tree0a8f2f1416f6cb56961e69cfb3c5befe5a5ef0eb /qtwebkit.pri
parent610bb3545d64a53b5a3fd2e45d207716eede673c (diff)
WebKit2 is not yet supported on Windows, so avoid trying to build it
Change-Id: If514bae79364def9fd3138c088e2cac98cac4a91 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
Diffstat (limited to 'qtwebkit.pri')
-rw-r--r--qtwebkit.pri3
1 files changed, 3 insertions, 0 deletions
diff --git a/qtwebkit.pri b/qtwebkit.pri
index 40ddf5bb..515a5f7f 100644
--- a/qtwebkit.pri
+++ b/qtwebkit.pri
@@ -45,6 +45,9 @@ contains(CONFIG, release):!contains(CONFIG, debug_and_release): {QTWEBKIT_BUILD_
# This should be reverted once npapi either works, or gracefully disables itself, for qpa.
qpa:QTWEBKIT_BUILD_CONFIG += --no-netscape-plugin
+# WebKit2 is not yet supported on Windows, so avoid trying to build it
+win32:QTWEBKIT_BUILD_CONFIG += --no-webkit2
+
# The '+' is to make parallel "make" work across the script boundary.
module_qtwebkit.commands = $${OPTI}$${SBC}cd qtwebkit && \
$$env_export \"WEBKITOUTPUTDIR=$$OUT_PWD/qtwebkit/WebKitBuild\" && $$GNUTOOLS \