From 8d23e37c8d85bf25924ae95af1ae409b2b0feafc Mon Sep 17 00:00:00 2001
From: Peter Varga <pvarga@inf.u-szeged.hu>
Date: Tue, 28 Apr 2015 13:42:34 +0200
Subject: [PATCH] Fix prefix build
Deploy resources, locales, icu and plugins into the build directory
instead of install directory. It is necessary when Qt is configured
with -developer-build and -prefix options: the compilation may fail
if user has no write access for install directory.
Task-number: QTBUG-45796
Change-Id: I425f26fcb4b611c255dd744cb9b4eafe16015d6f
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
---
src/core/core_module.pro | 4 ++--
src/core/gyp_run.pro | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/core/core_module.pro b/src/core/core_module.pro
index afa11d31f..df868949e 100644
--- a/src/core/core_module.pro
+++ b/src/core/core_module.pro
@@ -67,13 +67,13 @@ plugins.files = $$OUT_PWD/$$getConfigDir()/$${PLUGIN_PREFIX}ffmpegsumo$${PLUGIN_
}
!contains(QT_CONFIG, qt_framework): contains(QT_CONFIG, private_tests) {
- ICU_TARGET = $$shell_path($$[QT_INSTALL_DATA]/icudtl.dat)
+ ICU_TARGET = $$shell_path($$[QT_INSTALL_DATA/get]/icudtl.dat)
ICU_FILE = $$shell_path($$OUT_PWD/$$getConfigDir()/icudtl.dat)
icu_rule.target = $$ICU_TARGET
unix: icu_rule.commands = if [ -e $$ICU_FILE ] ; then $$QMAKE_COPY $$ICU_FILE $$ICU_TARGET ; fi
win32: icu_rule.commands = if exist $$ICU_FILE ( $$QMAKE_COPY $$ICU_FILE $$ICU_TARGET )
- PLUGIN_DIR = $$shell_path($$[QT_INSTALL_PLUGINS]/qtwebengine)
+ PLUGIN_DIR = $$shell_path($$[QT_INSTALL_PLUGINS/get]/qtwebengine)
PLUGIN_TARGET = $$shell_path($$PLUGIN_DIR/$${PLUGIN_PREFIX}ffmpegsumo$${PLUGIN_EXTENSION})
PLUGIN_FILE = $$shell_path($$OUT_PWD/$$getConfigDir()/$${PLUGIN_PREFIX}ffmpegsumo$${PLUGIN_EXTENSION})
plugins_rule.target = $$PLUGIN_TARGET
diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
index e1691faa6..4c6eb8c56 100644
--- a/src/core/gyp_run.pro
+++ b/src/core/gyp_run.pro
@@ -87,8 +87,8 @@ 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]\""
+ GYP_ARGS += "-D qt_install_data=\"$$[QT_INSTALL_DATA/get]\""
+ GYP_ARGS += "-D qt_install_translations=\"$$[QT_INSTALL_TRANSLATIONS/get]\""
}
!build_pass {
--
GitLab