From c4bf6792f6ffd551785b96d44f31d21543fe338e Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Wed, 8 Sep 2010 12:27:43 +1000
Subject: Revert "let WebKit inject itself into the qt configuration"

This reverts commit b35310bba20f0c33a61b03ea4eec6108ec873a7c.
---
 configure                                           | 2 +-
 mkspecs/modules/README                              | 3 ---
 mkspecs/modules/qt_webkit_version.pri               | 4 ++++
 projects.pro                                        | 4 +---
 src/3rdparty/webkit/WebCore/WebCore.pro             | 2 +-
 src/3rdparty/webkit/WebKit.pro                      | 6 ------
 src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri | 2 +-
 tools/configure/configureapp.cpp                    | 3 ++-
 8 files changed, 10 insertions(+), 16 deletions(-)
 delete mode 100644 mkspecs/modules/README
 create mode 100644 mkspecs/modules/qt_webkit_version.pri

diff --git a/configure b/configure
index c156655..bab70d3 100755
--- a/configure
+++ b/configure
@@ -7001,7 +7001,7 @@ if [ "$CFG_WEBKIT" = "auto" ]; then
 fi
 
 if [ "$CFG_WEBKIT" = "yes" ]; then
-    # Don't add "webkit" to QT_CONFIG here - it injects itself via the module.
+    QT_CONFIG="$QT_CONFIG webkit"
     # The reason we set CFG_WEBKIT, is such that the printed overview of what will be enabled, shows correctly.
     CFG_WEBKIT="yes"
 else
diff --git a/mkspecs/modules/README b/mkspecs/modules/README
deleted file mode 100644
index f095982..0000000
--- a/mkspecs/modules/README
+++ /dev/null
@@ -1,3 +0,0 @@
-Externally provided Qt modules may drop a qmake file here to become part of
-the current Qt configuration. The file name must follow the pattern
-"qt_<module>.pri". It must contain a "QT_CONFIG += <module>" statement.
diff --git a/mkspecs/modules/qt_webkit_version.pri b/mkspecs/modules/qt_webkit_version.pri
new file mode 100644
index 0000000..ffd192c
--- /dev/null
+++ b/mkspecs/modules/qt_webkit_version.pri
@@ -0,0 +1,4 @@
+QT_WEBKIT_VERSION = 4.7.0
+QT_WEBKIT_MAJOR_VERSION = 4
+QT_WEBKIT_MINOR_VERSION = 7
+QT_WEBKIT_PATCH_VERSION = 0
diff --git a/projects.pro b/projects.pro
index f94e1de..373b049 100644
--- a/projects.pro
+++ b/projects.pro
@@ -159,13 +159,11 @@ INSTALLS += qmake
 
 #mkspecs
 mkspecs.path=$$[QT_INSTALL_DATA]/mkspecs
-mkspecs.files=$$QT_BUILD_TREE/mkspecs/qconfig.pri $$files($$QT_SOURCE_TREE/mkspecs/*)
-mkspecs.files -= $$QT_SOURCE_TREE/mkspecs/modules
+mkspecs.files=$$QT_BUILD_TREE/mkspecs/qconfig.pri $$QT_SOURCE_TREE/mkspecs/*
 unix { 
    DEFAULT_QMAKESPEC = $$QMAKESPEC
    DEFAULT_QMAKESPEC ~= s,^.*mkspecs/,,g
    mkspecs.commands += $(DEL_FILE) $(INSTALL_ROOT)$$mkspecs.path/default; $(SYMLINK) $$DEFAULT_QMAKESPEC $(INSTALL_ROOT)$$mkspecs.path/default
-   mkspecs.files -= $$QT_SOURCE_TREE/mkspecs/default
 }
 win32:!equals(QT_BUILD_TREE, $$QT_SOURCE_TREE) {
     # When shadow building on Windows, the default mkspec only exists in the build tree.
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro
index ac0c47c..2047143 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
@@ -82,7 +82,7 @@ CONFIG(QTDIR_build) {
     symbian: TARGET =$$TARGET$${QT_LIBINFIX}
 }
 moduleFile=$$PWD/../WebKit/qt/qt_webkit_version.pri
-isEmpty(QT_BUILD_TREE):include($$moduleFile)
+include($$moduleFile)
 VERSION = $${QT_WEBKIT_MAJOR_VERSION}.$${QT_WEBKIT_MINOR_VERSION}.$${QT_WEBKIT_PATCH_VERSION}
 
 unix {
diff --git a/src/3rdparty/webkit/WebKit.pro b/src/3rdparty/webkit/WebKit.pro
index ef251c5..c7df391 100644
--- a/src/3rdparty/webkit/WebKit.pro
+++ b/src/3rdparty/webkit/WebKit.pro
@@ -34,9 +34,3 @@ symbian {
 }
 
 include(WebKit/qt/docs/docs.pri)
-
-!isEmpty(QT_BUILD_TREE) {
-    QMAKE_SUBSTITUTES += qt_webkit_version
-    qt_webkit_version.input = WebKit/qt/qt_webkit_version.pri
-    qt_webkit_version.output = $$QT_BUILD_TREE/mkspecs/modules/qt_webkit_version.pri
-}
diff --git a/src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri b/src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri
index 4594d1e..d8cf06c 100644
--- a/src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri
+++ b/src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri
@@ -2,4 +2,4 @@ QT_WEBKIT_VERSION = 4.7.0
 QT_WEBKIT_MAJOR_VERSION = 4
 QT_WEBKIT_MINOR_VERSION = 7
 QT_WEBKIT_PATCH_VERSION = 0
-QT_CONFIG += webkit
+QT_CONFIG *= webkit
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 6e24027..a6cd6c1 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2658,7 +2658,8 @@ void Configure::generateOutputVars()
             qtConfig += "audio-backend";
     }
 
-    // Don't add "webkit" to QT_CONFIG here - it injects itself via the module.
+    if (dictionary["WEBKIT"] == "yes")
+        qtConfig += "webkit";
 
     if (dictionary["DECLARATIVE"] == "yes") {
         if (dictionary[ "SCRIPT" ] == "no") {
-- 
cgit v0.12