summaryrefslogtreecommitdiff
path: root/mkspecs/modules
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2010-07-27 13:46:00 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2010-07-27 13:47:49 +0200
commit4cd413970b18125885ce60d82a4ad06bce6395a5 (patch)
tree5ff7455c9434ce2d848833f5cc8e607b2412804c /mkspecs/modules
parent29a6377c6539840ca901bdcb045a42b7832ac98a (diff)
downloadqt4-tools-4cd413970b18125885ce60d82a4ad06bce6395a5.tar.gz
Make it possible again to build Qt without webkit
Remove the QT_CONFIG line from the qt_webkit_version.pri file in Qt, because it is only meaningful for separate builds of WebKit. (Real fix is in the import script that takes care of always removing that line) Task-number: QTBUG-12456 Discussed-with: axis
Diffstat (limited to 'mkspecs/modules')
-rw-r--r--mkspecs/modules/qt_webkit_version.pri1
1 files changed, 0 insertions, 1 deletions
diff --git a/mkspecs/modules/qt_webkit_version.pri b/mkspecs/modules/qt_webkit_version.pri
index d8cf06c121..ffd192c315 100644
--- a/mkspecs/modules/qt_webkit_version.pri
+++ b/mkspecs/modules/qt_webkit_version.pri
@@ -2,4 +2,3 @@ QT_WEBKIT_VERSION = 4.7.0
QT_WEBKIT_MAJOR_VERSION = 4
QT_WEBKIT_MINOR_VERSION = 7
QT_WEBKIT_PATCH_VERSION = 0
-QT_CONFIG *= webkit