Title: [155034] trunk
- Revision
- 155034
- Author
- michael.brun...@digia.com
- Date
- 2013-09-04 03:50:09 -0700 (Wed, 04 Sep 2013)
Log Message
[Qt] Use correct library paths for prefix builds on Mac.
https://bugs.webkit.org/show_bug.cgi?id=120635
Reviewed by Tor Arne Vestbø.
Due to a change of scope of the qmake force_independent configuration
flag, the library paths in QtWebKit builds on the Mac are set to the
QtWebKit build directory even for production builds.
This patch sets the correct library paths for prefixed production builds
while keeping the scope of the force_independent flag for non-production
builds.
* Source/api.pri:
* Source/widgetsapi.pri:
Modified Paths
Diff
Modified: trunk/ChangeLog (155033 => 155034)
--- trunk/ChangeLog 2013-09-04 10:33:57 UTC (rev 155033)
+++ trunk/ChangeLog 2013-09-04 10:50:09 UTC (rev 155034)
@@ -1,3 +1,21 @@
+2013-09-04 Michael Brüning <michael.brun...@digia.com>
+
+ [Qt] Use correct library paths for prefix builds on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=120635
+
+ Reviewed by Tor Arne Vestbø.
+
+ Due to a change of scope of the qmake force_independent configuration
+ flag, the library paths in QtWebKit builds on the Mac are set to the
+ QtWebKit build directory even for production builds.
+
+ This patch sets the correct library paths for prefixed production builds
+ while keeping the scope of the force_independent flag for non-production
+ builds.
+
+ * Source/api.pri:
+ * Source/widgetsapi.pri:
+
2013-09-04 Zan Dobersek <zdober...@igalia.com>
[GTK] Add support for the Wayland build target
Modified: trunk/Source/api.pri (155033 => 155034)
--- trunk/Source/api.pri 2013-09-04 10:33:57 UTC (rev 155033)
+++ trunk/Source/api.pri 2013-09-04 10:50:09 UTC (rev 155034)
@@ -75,7 +75,7 @@
load(qt_module)
# Make sure the install_name of the QtWebKit library point to webkit
-force_independent:macx {
+!production_build:force_independent:macx {
# We do our own absolute path so that we can trick qmake into
# using the webkit build path instead of the Qt install path.
CONFIG -= absolute_library_soname
Modified: trunk/Source/widgetsapi.pri (155033 => 155034)
--- trunk/Source/widgetsapi.pri 2013-09-04 10:33:57 UTC (rev 155033)
+++ trunk/Source/widgetsapi.pri 2013-09-04 10:50:09 UTC (rev 155034)
@@ -74,7 +74,7 @@
load(qt_module)
# Make sure the install_name of the QtWebKit library point to webkit
-force_independent:macx {
+!production_build:force_independent:macx {
# We do our own absolute path so that we can trick qmake into
# using the webkit build path instead of the Qt install path.
CONFIG -= absolute_library_soname
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
