diff options
Diffstat (limited to 'src/process/process.pro')
-rw-r--r-- | src/process/process.pro | 18 |
1 files 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 |