diff options
| author | Michael Brüning <michael.bruning@digia.com> | 2013-09-04 12:59:52 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-04 14:18:03 +0200 |
| commit | 97237c4d8cd4e2e2403993c3d45391fb4b46fc58 (patch) | |
| tree | a2c77a2e415629f4347db8a1d9b493e0b70cb4f8 | |
| parent | bd718a4913f30729f515bfe16c3aee88a349821d (diff) | |
| download | qtwebkit-97237c4d8cd4e2e2403993c3d45391fb4b46fc58.tar.gz | |
[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:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@155034 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Change-Id: I2563e5e7f9582128f32bae459df54186ff88fe87
Task-number: QTBUG-32417
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| -rw-r--r-- | Source/api.pri | 2 | ||||
| -rw-r--r-- | Source/widgetsapi.pri | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/api.pri b/Source/api.pri index 628a49ba1..61fcba101 100644 --- a/Source/api.pri +++ b/Source/api.pri @@ -68,7 +68,7 @@ BASE_TARGET = $$TARGET 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 diff --git a/Source/widgetsapi.pri b/Source/widgetsapi.pri index 9504d91f2..86693da88 100644 --- a/Source/widgetsapi.pri +++ b/Source/widgetsapi.pri @@ -70,7 +70,7 @@ BASE_TARGET = $$TARGET 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 |