diff options
| author | Miguel Costa <miguel.costa@qt.io> | 2019-01-29 15:37:00 +0100 |
|---|---|---|
| committer | Miguel Costa <miguel.costa@qt.io> | 2019-01-30 09:56:06 +0000 |
| commit | 7cf1eea3ff24ef036b92e775821691d2ac7fbecd (patch) | |
| tree | 999153c3ba210f3302afb726d7da4258179fa478 | |
| parent | 6a30d6777b5e17006edda4fc8a1fc038e5a304d2 (diff) | |
Fix rcc error when $(QTDIR) contains spaces
Same rationale as:
Fix rcc error when paths contain spaces
6a30d6777b5e17006edda4fc8a1fc038e5a304d2
Besides the path to the QRC and to the output file, the path to rcc.exe,
which depends on $(QTDIR), also requires surrounding quotes, given that
$(QTDIR) may contain space characters.
Task-number: QTVSADDINBUG-608
Change-Id: I556acfcbf6998620882d8f237894c414af256b16
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| -rw-r--r-- | src/qtmsbuild/qtrcc.targets | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qtmsbuild/qtrcc.targets b/src/qtmsbuild/qtrcc.targets index 8fd93bf6..4f2bc339 100644 --- a/src/qtmsbuild/qtrcc.targets +++ b/src/qtmsbuild/qtrcc.targets @@ -67,11 +67,12 @@ <!--// Parse QRC --> <PropertyGroup> + <QtRccExeQuoted>"%(QtRcc.QTDIR)\bin\rcc.exe"</QtRccExeQuoted> <QtRccQuoted>"%(QtRcc.Identity)"</QtRccQuoted> <RccListQuoted>"$(IntDir)rcc_list.txt"</RccListQuoted> </PropertyGroup> <Exec Condition="'@(QtRcc)' != ''" - Command="%(QtRcc.QTDIR)\bin\rcc.exe --list $(QtRccQuoted) > $(RccListQuoted) 2> nul"/> + Command="$(QtRccExeQuoted) --list $(QtRccQuoted) > $(RccListQuoted) 2> nul"/> <ReadLinesFromFile Condition="'@(QtRcc)' != '' AND Exists('$(IntDir)rcc_list.txt')" File="$(IntDir)rcc_list.txt"> <Output TaskParameter="Lines" ItemName="res_file"/> @@ -88,6 +89,7 @@ <!--// Clean-up --> <PropertyGroup> + <QtRccExeQuoted/> <QtRccQuoted/> <RccListQuoted/> </PropertyGroup> |