diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-07-09 14:14:00 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-07-10 07:55:40 +0000 |
| commit | edcb8efb8bdbfa820f0580965d9a134a703d00b6 (patch) | |
| tree | be079d88663ac2eb1cc14cd63a8fcf9dd0670d0a | |
| parent | 91030f807a38ba135f3ffc19d498024164d5692c (diff) | |
Fix running lrelease and lupdate as external tools
With newer Qt versions. These want to run cl.exe on Windows, which
usually is not on the PATH except for the build environment.
So, use the current build environment's PATH if that is available
(falling back to the system environment's PATH).
Task-number: QTCREATORBUG-19892
Change-Id: Ia512b3599d2cca7a0d1169b0d673f32158cb701f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| -rw-r--r-- | src/share/qtcreator/externaltools/lrelease.xml | 1 | ||||
| -rw-r--r-- | src/share/qtcreator/externaltools/lupdate.xml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/share/qtcreator/externaltools/lrelease.xml b/src/share/qtcreator/externaltools/lrelease.xml index 6e450d237f..f365591132 100644 --- a/src/share/qtcreator/externaltools/lrelease.xml +++ b/src/share/qtcreator/externaltools/lrelease.xml @@ -36,5 +36,6 @@ <path>lrelease</path> <arguments>%{CurrentProject:FilePath}</arguments> <workingdirectory>%{CurrentProject:Path}</workingdirectory> + <environment>PATH%3D%25%7BJS%3Aif%20%28%22%25%7BCurrentBuild%3AEnv%3APATH%7D%22%29%20%22%25%7BCurrentBuild%3AEnv%3APATH%7D%22%3B%20else%20%22%25%7BEnv%3APATH%7D%22%7D</environment> </executable> </externaltool> diff --git a/src/share/qtcreator/externaltools/lupdate.xml b/src/share/qtcreator/externaltools/lupdate.xml index 8991c13439..bc2e350282 100644 --- a/src/share/qtcreator/externaltools/lupdate.xml +++ b/src/share/qtcreator/externaltools/lupdate.xml @@ -36,5 +36,6 @@ <path>lupdate</path> <arguments>%{CurrentProject:FilePath}</arguments> <workingdirectory>%{CurrentProject:Path}</workingdirectory> + <environment>PATH%3D%25%7BJS%3Aif%20%28%22%25%7BCurrentBuild%3AEnv%3APATH%7D%22%29%20%22%25%7BCurrentBuild%3AEnv%3APATH%7D%22%3B%20else%20%22%25%7BEnv%3APATH%7D%22%7D</environment> </executable> </externaltool> |