From 08f7ae57fe51ad01cd5bef2ddeb92ea1556218e9 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 27 Jul 2010 13:46:00 +0200 Subject: 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 (cherry picked from commit 4cd413970b18125885ce60d82a4ad06bce6395a5) --- mkspecs/modules/qt_webkit_version.pri | 1 - 1 file changed, 1 deletion(-) diff --git a/mkspecs/modules/qt_webkit_version.pri b/mkspecs/modules/qt_webkit_version.pri index d8cf06c..ffd192c 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 -- cgit v0.12