aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-08-27 10:48:35 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-27 12:13:42 +0200
commitf00429b71a3962efdad73c873c4882638a10df7c (patch)
tree0d693ca68373464b31115c5062d77b5619edec1e
parent5a109341ca30e1914732304a15c11a04f61d380f (diff)
Disable WebKit2 for the Qt 5 beta
Disable all of WebKit2 until https://bugs.webkit.org/show_bug.cgi?id=94914 is fixed. Change-Id: Iffc11efdba7c2c6ad4fe92437c28c77fd5d5a2bf Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
-rw-r--r--qtwebkit.pri3
1 files changed, 2 insertions, 1 deletions
diff --git a/qtwebkit.pri b/qtwebkit.pri
index 6aae9e65..cb169130 100644
--- a/qtwebkit.pri
+++ b/qtwebkit.pri
@@ -42,7 +42,8 @@ QTWEBKIT_BUILD_CONFIG =
contains(CONFIG, release):!contains(CONFIG, debug_and_release): {QTWEBKIT_BUILD_CONFIG = --release}
# WebKit2 is not yet supported on Windows, so avoid trying to build it
-win32:QTWEBKIT_BUILD_CONFIG += --no-webkit2
+# Disable WebKit2 until https://bugs.webkit.org/show_bug.cgi?id=94914 is fixed.
+QTWEBKIT_BUILD_CONFIG += --no-webkit2
# The '+' is to make parallel "make" work across the script boundary.
module_qtwebkit.commands = $${OPTI}$${SBC}cd qtwebkit && \