[Qt] Use LIBS_PRIVATE instead of putting dependencies into LIBS

Patch by Oswald Buddenhagen <oswald.buddenhagen@nokia.com> on 2012-06-27
Reviewed by Tor Arne Vestbø..

* qmake/mkspecs/features/default_post.prf:
* qmake/mkspecs/features/functions.prf:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121540 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 07aff67..e7ce8ff 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,12 @@
+2012-06-27  Oswald Buddenhagen  <oswald.buddenhagen@nokia.com>
+
+        [Qt] Use LIBS_PRIVATE instead of putting dependencies into LIBS
+
+        Reviewed by Tor Arne Vestbø..
+
+        * qmake/mkspecs/features/default_post.prf:
+        * qmake/mkspecs/features/functions.prf:
+
 2012-06-28  Ryosuke Niwa  <rniwa@webkit.org>
 
         DOMHTMLCollection::item may return a wrong element after namedItem is called

diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf
index dec4a6d..0ffe911 100644 (file)
--- a/Tools/qmake/mkspecs/features/default_post.prf
+++ b/Tools/qmake/mkspecs/features/default_post.prf
@@ -204,15 +204,13 @@ for(library, WEBKIT) {
 
     # More juggling
     dependent_libs = $$LIBS
-    unset(LIBS)
+    LIBS = $$existing_libs
 
     # But we might also need to link against it
     needToLink() {
         linkAgainstLibrary($$library, $$eval(WEBKIT.$${library_identifier}.root_source_dir))
-        LIBS += $$dependent_libs
+        LIBS_PRIVATE += $$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 f0e9d15..a72c4a2 100644 (file)
--- a/Tools/qmake/mkspecs/features/functions.prf
+++ b/Tools/qmake/mkspecs/features/functions.prf
@@ -261,36 +261,29 @@ defineTest(linkAgainstLibrary) {
     path = $$replace(source_dir, $${ROOT_WEBKIT_DIR}, $${ROOT_BUILD_DIR})/$$activeBuildConfig()
 
     force_static_libs_as_shared {
-            LIBS += -L$${ROOT_BUILD_DIR}/lib -l$$target
+            LIBS_PRIVATE += -L$${ROOT_BUILD_DIR}/lib -l$$target
     } else {
 
         mac {
-            LIBS += -Wl,-force_load,$${path}$${QMAKE_DIR_SEP}lib$${target}.a
+            LIBS_PRIVATE += -Wl,-force_load,$${path}$${QMAKE_DIR_SEP}lib$${target}.a
         } else:win32-msvc*|wince*|win32-icc {
-            LIBS += /OPT:REF -l$$target
+            LIBS_PRIVATE += /OPT:REF -l$$target
         } else {
-            LIBS += -Wl,-whole-archive -l$$target -Wl,-no-whole-archive
+            LIBS_PRIVATE += -Wl,-whole-archive -l$$target -Wl,-no-whole-archive
         }
 
         win32-msvc*|wince*|win32-icc {
-            LIBS += -L$$path
+            LIBS_PRIVATE += -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)
+    export(LIBS_PRIVATE)
     export(QMAKE_LIBDIR)
     export(POST_TARGETDEPS)
-    export(CONFIG)
     return(true)
 }