From 03a52863226aeb774721db610ba831808b30836a Mon Sep 17 00:00:00 2001 From: Peter Varga Date: Thu, 27 Nov 2014 14:26:57 +0100 Subject: Fix deployment problems with developer builds This fix deploys the following files into qtbase without make install: - qtwebengine_resources.pak - translations/qtwebengine_locales/*.pak - icudtl.dat - plugins/qtwebengine/libffmpegsumo.so Change-Id: Id2c02f03fb01571942d3135b215ebb8ad7a3221b Reviewed-by: Andras Becsi --- src/core/gyp_run.pro | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/core/gyp_run.pro') diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro index 137b600b9..8d4d77351 100644 --- a/src/core/gyp_run.pro +++ b/src/core/gyp_run.pro @@ -87,6 +87,11 @@ contains(QT_ARCH, "i386"): GYP_ARGS += "-D target_arch=ia32" contains(WEBENGINE_CONFIG, proprietary_codecs): GYP_ARGS += "-Dproprietary_codecs=1 -Dffmpeg_branding=Chrome -Duse_system_ffmpeg=0" +!contains(QT_CONFIG, qt_framework): contains(QT_CONFIG, private_tests) { + GYP_ARGS += "-D qt_install_data=\"$$[QT_INSTALL_DATA]\"" + GYP_ARGS += "-D qt_install_translations=\"$$[QT_INSTALL_TRANSLATIONS]\"" +} + !build_pass { message("Running gyp_qtwebengine \"$$OUT_PWD\" $${GYP_ARGS}...") !system("python $$QTWEBENGINE_ROOT/tools/buildscripts/gyp_qtwebengine \"$$OUT_PWD\" $${GYP_ARGS}"): error("-- running gyp_qtwebengine failed --") -- cgit v1.2.3