diff options
| author | Miguel Costa <miguel.costa@qt.io> | 2019-01-25 15:47:37 +0100 |
|---|---|---|
| committer | Miguel Costa <miguel.costa@qt.io> | 2019-01-28 08:54:49 +0000 |
| commit | 6a30d6777b5e17006edda4fc8a1fc038e5a304d2 (patch) | |
| tree | 19f69df0ae3bdea9419ddca2abc0ba6317996710 | |
| parent | cde9a20d5a25845bb20ff9fac6a07ca3a09099f3 (diff) | |
Fix rcc error when paths contain spaces
During the build preparation phase in Qt/MSBuild, When calling rcc to
list the resources in QRC files, will now add quotes around paths in the
command line of rcc. Previously, if those paths contained spaces, the
call to rcc would fail.
Task-number: QTVSADDINBUG-608
Change-Id: I5a896d9458c2c76a30ca06315cfceb67ad1534ed
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | src/qtmsbuild/qtrcc.targets | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/qtmsbuild/qtrcc.targets b/src/qtmsbuild/qtrcc.targets index 5b8e6875..8fd93bf6 100644 --- a/src/qtmsbuild/qtrcc.targets +++ b/src/qtmsbuild/qtrcc.targets @@ -66,8 +66,12 @@ Inputs="%(QtRcc.Identity)" Outputs="@(QtRcc->'####### Don't skip this target #######')"> <!--// Parse QRC --> + <PropertyGroup> + <QtRccQuoted>"%(QtRcc.Identity)"</QtRccQuoted> + <RccListQuoted>"$(IntDir)rcc_list.txt"</RccListQuoted> + </PropertyGroup> <Exec Condition="'@(QtRcc)' != ''" - Command="%(QtRcc.QTDIR)\bin\rcc.exe --list %(QtRcc.Identity) > $(IntDir)rcc_list.txt 2> nul"/> + Command="%(QtRcc.QTDIR)\bin\rcc.exe --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"/> @@ -83,6 +87,10 @@ </ItemGroup> <!--// Clean-up --> + <PropertyGroup> + <QtRccQuoted/> + <RccListQuoted/> + </PropertyGroup> <ItemGroup> <res_file Remove="@(res_file)"/> </ItemGroup> |