diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-11 10:01:36 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-11 10:53:06 +0200 |
| commit | 7978feadee937299798372bced1680f52b4b1842 (patch) | |
| tree | bb844daade8c195c0a963f4663c2a0f880bd840a /src/process/process.pro | |
| parent | 56ceccc4d4ff395983c4a2fbbe12fe8cb591cfb5 (diff) | |
| parent | 56955e73d4be21bc3f086d1c805352a96944a25c (diff) | |
Merge branch '5.6' into 5.7
Change-Id: I53645ee5405b1c43807123fd3c196e314cfd1ce9
Diffstat (limited to 'src/process/process.pro')
| -rw-r--r-- | src/process/process.pro | 33 |
1 files changed, 14 insertions, 19 deletions
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 |