From 32bc5f01c416a4a54fd0ff3835bd5d500707bce9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= <morten.sorvig@digia.com>
Date: Fri, 14 Nov 2014 17:03:57 +0100
Subject: Revert "Build Qt for OS X and iOS with relative rpath"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The change was made too late in the 5.4.0 release
cycle, and broke the Qt build and deployment in
several areas:
	- macdeployqt
	- OS X 10.7 builds
	- shadow builds

This reverts commit c0a54efc4091b365ffac09fc2827cf92f849d698.

Change-Id: I1c1ad4901228f5516352ccdfa963e8ea2b5013b6
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
---
 mkspecs/features/qt_build_config.prf | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'mkspecs/features/qt_build_config.prf')

diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf
index 7197f84c9a..42046c238a 100644
--- a/mkspecs/features/qt_build_config.prf
+++ b/mkspecs/features/qt_build_config.prf
@@ -52,6 +52,12 @@ QMAKE_DIR_REPLACE_SANE = PRECOMPILED_DIR OBJECTS_DIR MOC_DIR RCC_DIR UI_DIR
     unset(modpath)
 }
 
+mac {
+   !isEmpty(QMAKE_RPATHDIR){
+       CONFIG += absolute_library_soname
+   }
+}
+
 cross_compile: \
     CONFIG += force_bootstrap
 
-- 
cgit v1.2.3