summaryrefslogtreecommitdiffstats
path: root/src/process
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@theqtcompany.com>2016-03-03 10:03:10 +0100
committerAlexandru Croitor <alexandru.croitor@theqtcompany.com>2016-03-24 11:17:54 +0000
commitf1e764039fd701e4abc71b44f592e166222a3e3c (patch)
tree81110c541286236cd3a7239524a261e239ed6e0e /src/process
parent8d693999de529a0a65305019778f259d9df8b5da (diff)
Use qt_app -> relative_qt_rpath for QtWebEngineProcess.
Use CONFIG+=relative_qt_rpath to make sure the web engine process contains a relative rpath instead of an absolute path rpath value. Change-Id: I5f3c9fb93273c41bed795aeba112f260382d2bf8 Task-number: QTBUG-50155 Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/process')
-rw-r--r--src/process/process.pro27
1 files changed, 12 insertions, 15 deletions
diff --git a/src/process/process.pro b/src/process/process.pro
index 5dc34884..cdda429e 100644
--- a/src/process/process.pro
+++ b/src/process/process.pro
@@ -1,36 +1,33 @@
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
QT += webenginecore
-load(qt_build_paths)
+INCLUDEPATH += ../core
+
+SOURCES = main.cpp
+
+win32 {
+ SOURCES += \
+ 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
- QMAKE_RPATHDIR += @loader_path/../../../../../../../../Frameworks
} else {
CONFIG -= app_bundle
win32: DESTDIR = $$MODULE_BASE_OUTDIR/bin
else: DESTDIR = $$MODULE_BASE_OUTDIR/libexec
}
-
msvc: QMAKE_LFLAGS *= /LARGEADDRESSAWARE
-INCLUDEPATH += ../core
-
-SOURCES = main.cpp
-
-win32 {
- SOURCES += \
- support_win.cpp
-}
-
contains(QT_CONFIG, qt_framework) {
target.path = $$[QT_INSTALL_LIBS]/QtWebEngineCore.framework/Versions/5/Helpers
} else {
target.path = $$[QT_INSTALL_LIBEXECS]
}
-INSTALLS += target