summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@theqtcompany.com>2016-02-24 13:14:09 +0100
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>2016-02-25 10:47:30 +0000
commit500d45df0ff57636131a1474de59805d63d6cde2 (patch)
tree2b00fbe9de2a85edd5759c36d142f39da6f9440c
parentea5b3418f2da62797ab7995bb87cbe7ce2c6150a (diff)
OS X: Fix QtWebEngineProcess @rpath handling so macdeployqt works.
When QtWebengineProcess was built on OSX using frameworks, all linked frameworks were found using @executable_path, except for QtPositioning which still used @rpath, and the run path list did not contain an entry to point to the main app bundle frameworks directory. Make sure all frameworks use @rpath, and also add a run path value pointing to the main app bundle frameworks directory, so all frameworks can be found once deployed with macdeployqt. Change-Id: Ie25f4c15169bd608dd819294901c196a7d794f43 Task-number: QTBUG-50155 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Michael BrĂ¼ning <michael.bruning@theqtcompany.com> Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
-rw-r--r--src/process/process.pro18
1 files changed, 2 insertions, 16 deletions
diff --git a/src/process/process.pro b/src/process/process.pro
index 6174e53b..eab11189 100644
--- a/src/process/process.pro
+++ b/src/process/process.pro
@@ -8,23 +8,9 @@ load(qt_build_paths)
contains(QT_CONFIG, qt_framework) {
# Deploy the QtWebEngineProcess app bundle into the QtWebEngineCore framework.
DESTDIR = $$MODULE_BASE_OUTDIR/lib/QtWebEngineCore.framework/Versions/5/Helpers
- # FIXME: remove the following workaround with proper rpath handling or
- # patching of the installed QtWebEngineProcess binary.
- # Since QtWebEngineCore is now built as a framework, we need to pull
- # in and fixup its dependencies as well.
+
QT += webenginecore
- QMAKE_POST_LINK = \
- "xcrun install_name_tool -change " \
- "`xcrun otool -X -L $(TARGET) | grep QtWebEngineCore | cut -d ' ' -f 1` " \
- "@executable_path/../../../../QtWebEngineCore " \
- "$(TARGET); "
- linked_frameworks = QtQuick QtQml QtNetwork QtCore QtGui QtWebChannel
- for (current_framework, linked_frameworks) {
- QMAKE_POST_LINK += "xcrun install_name_tool -change " \
- "`xcrun otool -X -L $(TARGET) | grep $${current_framework} | cut -d ' ' -f 1` " \
- "@executable_path/../../../../../../../$${current_framework}.framework/$${current_framework} " \
- "$(TARGET);"
- }
+ QMAKE_RPATHDIR += @loader_path/../../../../../../../../Frameworks
} else {
CONFIG -= app_bundle
win32: DESTDIR = $$MODULE_BASE_OUTDIR/bin