diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-11-06 11:33:53 +0100 |
---|---|---|
committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-11-06 15:30:22 +0100 |
commit | 66cd31938c4dc97a32a094d3906c21ecdd034f95 (patch) | |
tree | 3a3c3909d3902d124d7cfc696abe4b626e4caace /src/process | |
parent | fd47c264511e7dca55e666e49faa3a22612b584c (diff) |
Deploy external data in QtWebEngineCore.framework for framework builds
There is currently no convenient way to deploy QtWebEngine into an application
bundle on OSX. macdeployqt copies frameworks into a .app bundle's Frameworks
directory but this makes no sense unless all the needed files are also
distributed with the bundle.
This patch moves:
- The ffmpegsumo.so library into Libraries/
- Locale .pak files, qtwebengine_resources.pak and icudtl.dat into Resources/
- QtWebEngineProcess into its own .app bundle, itself into Helpers/
QMAKE_BUNDLE_DATA is used to copy files into the bundle while INSTALLS is
used when installing normally. A LOCALE_LIST is explicitly listed since
QMAKE_BUNDLE_DATA can't handle the * glob to match all source files.
Change-Id: I5c0df57b4b9e93f9cce34a74a6e024bf90d37b5c
Task-number: QTBUG-41611
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/process')
-rw-r--r-- | src/process/process.pro | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/process/process.pro b/src/process/process.pro index a9f5d183f..8ed09612a 100644 --- a/src/process/process.pro +++ b/src/process/process.pro @@ -3,14 +3,22 @@ TEMPLATE = app QT_PRIVATE += webenginecore -CONFIG -= app_bundle - load(qt_build_paths) -DESTDIR = $$MODULE_BASE_OUTDIR/libexec +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 + DESTDIR = $$MODULE_BASE_OUTDIR/libexec +} INCLUDEPATH += ../core SOURCES = main.cpp -target.path = $$[QT_INSTALL_LIBEXECS] +contains(QT_CONFIG, qt_framework) { + target.path = $$[QT_INSTALL_LIBS]/QtWebEngineCore.framework/Versions/5/Helpers +} else { + target.path = $$[QT_INSTALL_LIBEXECS] +} INSTALLS += target |