diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-11 09:05:49 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-04-11 15:33:49 +0000 |
| commit | 22a550303618202135e58f5673e7b8935d578687 (patch) | |
| tree | 560918164edd7b76a2a8b6246f6dbca0ee69cf9a /src/process | |
| parent | f8ed4ca51333157170f0fc94e2deff0d91cf4833 (diff) | |
| parent | 7978feadee937299798372bced1680f52b4b1842 (diff) | |
Merge "Merge branch '5.6' into 5.7" into refs/staging/5.7v5.7.0-beta1
Diffstat (limited to 'src/process')
| -rw-r--r-- | src/process/Info_mac.plist | 2 | ||||
| -rw-r--r-- | src/process/process.pro | 33 |
2 files changed, 15 insertions, 20 deletions
diff --git a/src/process/Info_mac.plist b/src/process/Info_mac.plist index de1d010bc..dcadc2e8f 100644 --- a/src/process/Info_mac.plist +++ b/src/process/Info_mac.plist @@ -15,7 +15,7 @@ <key>CFBundleExecutable</key> <string>@EXECUTABLE@</string> <key>CFBundleIdentifier</key> - <string>@BUNDLEIDENTIFIER@</string> + <string>org.qt-project.Qt.QtWebEngineProcess</string> <key>LSUIElement</key> <string>1</string> </dict> diff --git a/src/process/process.pro b/src/process/process.pro index eab11189e..cdda429e7 100644 --- a/src/process/process.pro +++ b/src/process/process.pro @@ -1,25 +1,9 @@ TARGET = $$QTWEBENGINEPROCESS_NAME -TEMPLATE = app -!build_pass:contains(QT_CONFIG, debug_and_release):contains(QT_CONFIG, build_all): CONFIG += release + # Needed to set LSUIElement=1 QMAKE_INFO_PLIST = Info_mac.plist -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 - - QT += webenginecore - QMAKE_RPATHDIR += @loader_path/../../../../../../../../Frameworks -} else { - CONFIG -= app_bundle - win32: DESTDIR = $$MODULE_BASE_OUTDIR/bin - else: DESTDIR = $$MODULE_BASE_OUTDIR/libexec - - QT_PRIVATE += webenginecore -} - -msvc: QMAKE_LFLAGS *= /LARGEADDRESSAWARE +QT += webenginecore INCLUDEPATH += ../core @@ -30,9 +14,20 @@ win32 { support_win.cpp } +load(qt_app) + +contains(QT_CONFIG, qt_framework) { + # Deploy the QtWebEngineProcess app bundle into the QtWebEngineCore framework. + DESTDIR = $$MODULE_BASE_OUTDIR/lib/QtWebEngineCore.framework/Versions/5/Helpers +} else { + CONFIG -= app_bundle + win32: DESTDIR = $$MODULE_BASE_OUTDIR/bin + else: DESTDIR = $$MODULE_BASE_OUTDIR/libexec +} +msvc: QMAKE_LFLAGS *= /LARGEADDRESSAWARE + contains(QT_CONFIG, qt_framework) { target.path = $$[QT_INSTALL_LIBS]/QtWebEngineCore.framework/Versions/5/Helpers } else { target.path = $$[QT_INSTALL_LIBEXECS] } -INSTALLS += target |