Title: [138707] trunk/Tools
- Revision
- 138707
- Author
- commit-qu...@webkit.org
- Date
- 2013-01-03 06:13:44 -0800 (Thu, 03 Jan 2013)
Log 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 <net...@gmail.com> on 2013-01-03
Reviewed by Tor Arne Vestbø.
* qmake/mkspecs/features/default_post.prf:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (138706 => 138707)
--- trunk/Tools/ChangeLog 2013-01-03 13:43:22 UTC (rev 138706)
+++ trunk/Tools/ChangeLog 2013-01-03 14:13:44 UTC (rev 138707)
@@ -1,3 +1,19 @@
+2013-01-03 Jonathan Liu <net...@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....@samsung.com>
[EFL][WK2] Fix tooltip bugs in MiniBrowser.
Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (138706 => 138707)
--- trunk/Tools/qmake/mkspecs/features/default_post.prf 2013-01-03 13:43:22 UTC (rev 138706)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2013-01-03 14:13:44 UTC (rev 138707)
@@ -202,6 +202,10 @@
# to end up in as public API dependenices in the QtWebKit prl file.
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
}
equals(_PRO_FILE_, $${ROOT_WEBKIT_DIR}/WebKit.pro):!isEmpty(OVERRIDE_SUBDIRS) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
