From e4e3a2c46d1cc2c91bf42f75d2eed005ad58b296 Mon Sep 17 00:00:00 2001
From: "vestbo@webkit.org"
 <vestbo@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri, 29 Jun 2012 10:15:22 +0000
Subject: [PATCH] Revert r121540, it broke most Qt builds

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121545 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
 Tools/ChangeLog                               |  7 +++++++
 Tools/qmake/mkspecs/features/default_post.prf |  6 ++++--
 Tools/qmake/mkspecs/features/functions.prf    | 19 +++++++++++++------
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 2822bee..ffdcda5 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,10 @@
+2012-06-29  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
+
+        Revert r121540, it broke most Qt builds
+
+        * qmake/mkspecs/features/default_post.prf:
+        * qmake/mkspecs/features/functions.prf:
+
 2012-06-29  Oswald Buddenhagen  <oswald.buddenhagen@nokia.com>
 
         [Qt] Make build-webkit reject uknown configurations, eg. --profile
diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf
index 0ffe911..dec4a6d 100644
--- a/Tools/qmake/mkspecs/features/default_post.prf
+++ b/Tools/qmake/mkspecs/features/default_post.prf
@@ -204,13 +204,15 @@ for(library, WEBKIT) {
 
     # More juggling
     dependent_libs = $$LIBS
-    LIBS = $$existing_libs
+    unset(LIBS)
 
     # But we might also need to link against it
     needToLink() {
         linkAgainstLibrary($$library, $$eval(WEBKIT.$${library_identifier}.root_source_dir))
-        LIBS_PRIVATE += $$dependent_libs
+        LIBS += $$dependent_libs
     }
+
+    LIBS = $$existing_libs $$LIBS
 }
 
 equals(_PRO_FILE_, $${ROOT_WEBKIT_DIR}/WebKit.pro):!isEmpty(OVERRIDE_SUBDIRS) {
diff --git a/Tools/qmake/mkspecs/features/functions.prf b/Tools/qmake/mkspecs/features/functions.prf
index a72c4a2..f0e9d15 100644
--- a/Tools/qmake/mkspecs/features/functions.prf
+++ b/Tools/qmake/mkspecs/features/functions.prf
@@ -261,29 +261,36 @@ defineTest(linkAgainstLibrary) {
     path = $$replace(source_dir, $${ROOT_WEBKIT_DIR}, $${ROOT_BUILD_DIR})/$$activeBuildConfig()
 
     force_static_libs_as_shared {
-            LIBS_PRIVATE += -L$${ROOT_BUILD_DIR}/lib -l$$target
+            LIBS += -L$${ROOT_BUILD_DIR}/lib -l$$target
     } else {
 
         mac {
-            LIBS_PRIVATE += -Wl,-force_load,$${path}$${QMAKE_DIR_SEP}lib$${target}.a
+            LIBS += -Wl,-force_load,$${path}$${QMAKE_DIR_SEP}lib$${target}.a
         } else:win32-msvc*|wince*|win32-icc {
-            LIBS_PRIVATE += /OPT:REF -l$$target
+            LIBS += /OPT:REF -l$$target
         } else {
-            LIBS_PRIVATE += -Wl,-whole-archive -l$$target -Wl,-no-whole-archive
+            LIBS += -Wl,-whole-archive -l$$target -Wl,-no-whole-archive
         }
 
         win32-msvc*|wince*|win32-icc {
-            LIBS_PRIVATE += -L$$path
+            LIBS += -L$$path
             POST_TARGETDEPS += $${path}$${QMAKE_DIR_SEP}$${target}.lib
         } else {
             QMAKE_LIBDIR += $$path
             POST_TARGETDEPS += $${path}$${QMAKE_DIR_SEP}lib$${target}.a
         }
+
+        # The following line is to prevent qmake from adding jscore to libQtWebKit's prl dependencies.
+        # The compromise we have to accept by disabling explicitlib is to drop support to link QtWebKit
+        # statically in applications (which isn't used often because, among other things, of licensing obstacles).
+        CONFIG -= explicitlib
+        CONFIG -= staticlib
     }
 
-    export(LIBS_PRIVATE)
+    export(LIBS)
     export(QMAKE_LIBDIR)
     export(POST_TARGETDEPS)
+    export(CONFIG)
     return(true)
 }
 
-- 
2.7.4