Title: [104027] trunk/Tools
- Revision
- 104027
- Author
- [email protected]
- Date
- 2012-01-04 04:55:36 -0800 (Wed, 04 Jan 2012)
Log Message
[Qt] Use rpath for WTR's InjectedBundle to pick up the right QtWebKit
It wasn't really a problem at runtime since the right QtWebKit was
already loaded as a dependency of the web process, but the ldd output
would still be busted.
Reviewed by Simon Hausmann.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (104026 => 104027)
--- trunk/Tools/ChangeLog 2012-01-04 12:55:18 UTC (rev 104026)
+++ trunk/Tools/ChangeLog 2012-01-04 12:55:36 UTC (rev 104027)
@@ -1,5 +1,17 @@
2012-01-04 Tor Arne Vestbø <[email protected]>
+ [Qt] Use rpath for WTR's InjectedBundle to pick up the right QtWebKit
+
+ It wasn't really a problem at runtime since the right QtWebKit was
+ already loaded as a dependency of the web process, but the ldd output
+ would still be busted.
+
+ Reviewed by Simon Hausmann.
+
+ * WebKitTestRunner/InjectedBundle/Target.pri:
+
+2012-01-04 Tor Arne Vestbø <[email protected]>
+
[Qt] Move use of $$qtLibraryTarget() to a single place
Reviewed by Kenneth Rohde Christiansen.
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri (104026 => 104027)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri 2012-01-04 12:55:18 UTC (rev 104026)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri 2012-01-04 12:55:36 UTC (rev 104027)
@@ -55,7 +55,7 @@
load(_javascript_core)
load(webcore)
-CONFIG += plugin qtwebkit
+CONFIG += plugin qtwebkit rpath
contains(DEFINES, HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
