diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 10:52:33 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 10:52:33 +0100 |
| commit | c2687689ba42d6021ae3f220d9fd240609489d3a (patch) | |
| tree | e96236e1590d9197200c4c51a1a353197a9de385 /src/process | |
| parent | 6d5b9ba008bba20f1c0a1642af5f5b7182f3e890 (diff) | |
| parent | 5c4ae298b0a3d75c4c5ea8aef0595914ab25607f (diff) | |
Merge remote-tracking branch 'origin/5.6.0' into 5.6
Conflicts:
src/3rdparty
Change-Id: Icbe7ea849b6ccdcee1ea1beccf86309ffb1ed578
Diffstat (limited to 'src/process')
| -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 |