kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)"

Browse Source 
This reverts commit 9a271e13236d81b79e3e367a6898e09d3dcf28d0.  The
`-list` option is not documented and may be removed in future Qt
versions.  Fixing this correctly will require detecting the availability
of `--list` or `-list` based on the `rcc` version found.  For now we
choose to support the documented option that will be supported in future
Qt versions.
This commit is contained in:
Brad King 2015-10-27 15:12:05 -04:00
parent 8c13f0f7ea
commit 10e8ccf6e5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmQtAutoGeneratorInitializer.cxx
View File

@ -494,7 +494,7 @@ static std::string ListQt5RccInputs(cmSourceFile* sf,
std::vector<std::string> command;
command.push_back(rccCommand);
command.push_back("-list");
command.push_back("--list");
std::string absFile = cmsys::SystemTools::GetRealPath(
sf->GetFullPath());