From 967372c975fcaea5c2ef4e8a5950fb60bab10e6c Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 5 Jun 2015 17:45:47 +0200 Subject: sanitize qt rpath handling, in particular on mac the addition of qt's rpath belongs into qt.prf - even on mac. so consolidate the two implementations. as a nice "side effect", we get relative rpaths also on linux. another "side effect" is that we don't unnecessarily add the qt rpath to qt modules also on linux. the qt rpath addition mechanism should not be responsible for setting the policy who gets a relative rpath, so move the logic to higher-level callers. Change-Id: I52e8fe2e8279e7b1ac25fae758867a5cb1cafcf8 Reviewed-by: Joerg Bornemann Reviewed-by: Oswald Buddenhagen --- mkspecs/features/qt_example_installs.prf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mkspecs/features/qt_example_installs.prf') diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf index 9c0026fbd0..a644904981 100644 --- a/mkspecs/features/qt_example_installs.prf +++ b/mkspecs/features/qt_example_installs.prf @@ -101,5 +101,7 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples) SOURCES = OBJECTIVE_SOURCES = INSTALLS -= target + } else { + CONFIG += relative_qt_rpath # Examples built as part of Qt should be relocatable } } -- cgit v1.2.3