Changeset 138707 in webkit

Timestamp:

Jan 3, 2013 6:13:44 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt] Fix library linking order
​https://bugs.webkit.org/show_bug.cgi?id=105818

Some Qt libraries are linked before the private static libraries
that depend on them which results in QtWebKit failing to link.

Copy Qt module dependencies from QT to QT_PRIVATE when creating
module to ensure the Qt libraries are linked after the private
static libraries that depend on them.

Patch by Jonathan Liu <​net147@gmail.com> on 2013-01-03
Reviewed by Tor Arne Vestbø.

• qmake/mkspecs/features/default_post.prf:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• qmake/mkspecs/features/default_post.prf (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-01-03  Jonathan Liu  <net147@gmail.com>
+
+        [Qt] Fix library linking order
+        https://bugs.webkit.org/show_bug.cgi?id=105818
+
+        Some Qt libraries are linked before the private static libraries
+        that depend on them which results in QtWebKit failing to link.
+
+        Copy Qt module dependencies from QT to QT_PRIVATE when creating
+        module to ensure the Qt libraries are linked after the private
+        static libraries that depend on them.
+
+        Reviewed by Tor Arne Vestbø.
+
+        * qmake/mkspecs/features/default_post.prf:
+
 2013-01-02  Byungwoo Lee  <bw80.lee@samsung.com>
 

trunk/Tools/qmake/mkspecs/features/default_post.prf

@@ -203 +203 @@
     LIBS_PRIVATE += $$LIBS
     unset(LIBS)
+    # Copy Qt module dependencies from QT to QT_PRIVATE to ensure the
+    # Qt libraries are linked after the private static libraries that
+    # depend on them
+    QT_PRIVATE += $$QT
 }