diff options
| author | Michael Bruning <michael.bruning@theqtcompany.com> | 2015-10-28 16:00:20 +0100 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@theqtcompany.com> | 2015-10-30 12:34:34 +0000 |
| commit | b4c9c02e736b70572d30311e080a3d5cdf9ca154 (patch) | |
| tree | 758822943d7716bd0e800a7767128a9bcd7ee818 | |
| parent | 6c909a25d0f0e358dfc8fefd55d18f704ba26c80 (diff) | |
Revert "Remove rpath workaround from QtWebProcess build."
It does not work properly with the new rpath logic and causes
problems with the installer packages. This should be a temporary
fix until the rpath situation has been cleaned up again.
This reverts commit 819279827a4ce05562909994468ec5604392c672.
Change-Id: I082ba0118d410f90d202c786d07717bf224d5f70
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| -rw-r--r-- | src/process/process.pro | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/process/process.pro b/src/process/process.pro index ee859a05c..6174e53bf 100644 --- a/src/process/process.pro +++ b/src/process/process.pro @@ -8,8 +8,23 @@ 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);" + } } else { CONFIG -= app_bundle win32: DESTDIR = $$MODULE_BASE_OUTDIR/bin |