From fa301d45535f8295f429186c2dc83f19479c9d68 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Tue, 5 Jul 2016 18:04:28 +0200
Subject: Fix building with Qt 5.5.1 on OS X

Since Qt 5.5.1 the packages from qt.io require setting the
rpath for linking.

Test-Information:

Tested building with dist=1 and testing distribution
packages and their used runtime libraries with Qt 5.4.2 and
Qt 5.5.1.

Change-Id: Idc6826a61489842d39c1d6aec3548e26da48e738

diff --git a/BuildTools/SCons/Tools/qt4.py b/BuildTools/SCons/Tools/qt4.py
index a0b29ba..31477c6 100644
--- a/BuildTools/SCons/Tools/qt4.py
+++ b/BuildTools/SCons/Tools/qt4.py
@@ -564,7 +564,7 @@ def enable_modules(self, modules, debug=False, crosscompiling=False, version='4'
             self.AppendUnique(LIBPATH=[os.path.join('$QTDIR','lib')])
             self.AppendUnique(LINKFLAGS="-F$QTDIR/lib")
             self.AppendUnique(CPPFLAGS="-iframework$QTDIR/lib")
-            self.AppendUnique(LINKFLAGS="-L$QTDIR/lib") #TODO clean!
+            self.Append(LINKFLAGS="-Wl,-rpath,$QTDIR/lib")
 
         # FIXME: Phonon Hack
         if version == '4' :
-- 
cgit v0.10.2-6-g49f6