From 500d45df0ff57636131a1474de59805d63d6cde2 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 24 Feb 2016 13:14:09 +0100 Subject: OS X: Fix QtWebEngineProcess @rpath handling so macdeployqt works. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Michael Brüning Reviewed-by: Jake Petroules --- src/process/process.pro | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/src/process/process.pro b/src/process/process.pro index 6174e53bf..eab11189e 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 -- cgit v1.2.3