diff options
| author | Jake Petroules <jake.petroules@theqtcompany.com> | 2015-09-05 18:21:19 -0700 |
|---|---|---|
| committer | Mika Lindqvist <postmaster@raasu.org> | 2015-09-06 18:05:35 +0000 |
| commit | 819279827a4ce05562909994468ec5604392c672 (patch) | |
| tree | e262be0c2178100942ddd0c8cbc29f05adb6cbb6 /src/process/process.pro | |
| parent | 614910c7b80a9f0736c2bc0b158a91180b083409 (diff) | |
Remove rpath workaround from QtWebProcess build.
This also fixes a runtime failure when building the webengine module
independently (for example, where QtCore and QtWebEngine* frameworks
are located in different directories).
Change-Id: I801d74da0be495089bf552b85b507918684b9685
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Diffstat (limited to 'src/process/process.pro')
| -rw-r--r-- | src/process/process.pro | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/process/process.pro b/src/process/process.pro index 7844b1004..7bf06a376 100644 --- a/src/process/process.pro +++ b/src/process/process.pro @@ -9,23 +9,7 @@ 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: We can remove those steps in Qt 5.5 once @rpath works - # "QT += webenginecore" would pull all dependencies that we'd also need to update - # with install_name_tool on OSX, but we only need access to the private - # QtWebEngine::processMain. qtAddModule will take care of finding where - # the library is without pulling additional librarie. - QT = core - qtAddModule(webenginecore, LIBS) - CONFIG -= link_prl - QMAKE_POST_LINK = \ - "xcrun install_name_tool -change " \ - "`xcrun otool -X -L $(TARGET) | grep QtWebEngineCore | cut -d ' ' -f 1` " \ - "@executable_path/../../../../QtWebEngineCore " \ - "$(TARGET); " \ - "xcrun install_name_tool -change " \ - "`xcrun otool -X -L $(TARGET) | grep QtCore | cut -d ' ' -f 1` " \ - "@executable_path/../../../../../../../QtCore.framework/QtCore " \ - "$(TARGET) " + QT += webenginecore } else { CONFIG -= app_bundle win32: DESTDIR = $$MODULE_BASE_OUTDIR/bin |