summaryrefslogtreecommitdiffstats
path: root/src/process
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-02-28 11:27:02 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-07 18:19:19 +0100
commit7d371328265a4912fb323779adf95cc922a83541 (patch)
tree2e7a24c90828a11f0879e5877171a118a7e1fd92 /src/process
parenta2e45ded2dd1a9c183f1ff4ea84057f5c43972c5 (diff)
Deploy QtWebEngineCore as a Qt module
This delegates the linking step from ninja to qmake so that we can let qmake decide the destination of the target itself, easing the deployment and installation logic across platforms. The module is only deployed as a binary and no header are available outside of the source tree. This is only to make sure that the dependence of the QtWebEngine and QtWebEngineWidgets libraries on it is resolved at runtime exactly the same way as with other Qt modules, on all platforms. Ninja still takes care of the compilation and gyp lets qmake know how and what to link by dumping the list of flags and input files in a generated .pri file. This has to be done in a separate .pro file so that we can make sure that ninja is run inconditionally before make reaches the dependency check in core_module.pro, ensured by the parent Makefile. Note 1: This patch removes RPATH hacks that are no longer necessary Note 2: Other targets like ffmpegsumo are still linked by ninja. The same logic could be moved to a qmake file but this require some more work to make sure that some switches (e.g. -stdlib=libc++) are coordinated between gyp and qmake. Change-Id: If65968547bde5b9cf732e31e97931c17ae1921a7 Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/process')
-rw-r--r--src/process/process.pro10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/process/process.pro b/src/process/process.pro
index cc68e3dd..a9f5d183 100644
--- a/src/process/process.pro
+++ b/src/process/process.pro
@@ -1,15 +1,9 @@
TARGET = $$QTWEBENGINEPROCESS_NAME
TEMPLATE = app
-macx {
- LIBPATH = $$getOutDir()/$$getConfigDir()
- CONFIG -= app_bundle
-} else:LIBPATH = $$getOutDir()/$$getConfigDir()/lib
-LIBS_PRIVATE += -L$$LIBPATH -lQt5WebEngineCore
-QMAKE_RPATHDIR += $$LIBPATH
+QT_PRIVATE += webenginecore
-qnx: QMAKE_RPATHLINKDIR += $${QNX_DIR}/$${QNX_CPUDIR}/usr/lib/qt5/lib
-else: cross_compile: QMAKE_RPATHLINKDIR += $$[QT_INSTALL_LIBS]
+CONFIG -= app_bundle
load(qt_build_paths)
DESTDIR = $$MODULE_BASE_OUTDIR/libexec