diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2015-04-28 13:42:34 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-04-29 12:01:58 +0000 |
| commit | 8d23e37c8d85bf25924ae95af1ae409b2b0feafc (patch) | |
| tree | f7a5147b360c1a2e82ce54e592a31d10c1b5d77c /src/core/gyp_run.pro | |
| parent | 4144406df5bb4a0062e95de24eba03ee90e05576 (diff) | |
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>
Diffstat (limited to 'src/core/gyp_run.pro')
| -rw-r--r-- | src/core/gyp_run.pro | 4 |
1 files changed, 2 insertions, 2 deletions
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 { |