diff --git a/src/process/process.pro b/src/process/process.pro index 8ed09612a4c8ab129878e5640377b835baf7c3a6..ad1575c81f253d432a9f7163dba3cdf0706fe24a 100644 --- a/src/process/process.pro +++ b/src/process/process.pro @@ -1,15 +1,33 @@ TARGET = $$QTWEBENGINEPROCESS_NAME TEMPLATE = app -QT_PRIVATE += webenginecore - 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: 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) " } else { CONFIG -= app_bundle DESTDIR = $$MODULE_BASE_OUTDIR/libexec + + QT_PRIVATE += webenginecore } INCLUDEPATH += ../core