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

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

In commit v3.2.0-rc1~480^2 (QtAutogen: Regenerate qrc files if their
input changes, 2014-09-17) we added use of the rcc "--list" option.
Prior to Qt 5.2 this option was called just "-list", and the older name
is still supported by the newer tools.  Use the older name of the option
for compatibility with Qt 5.0 and 5.1.
This commit is contained in:
Brad King 2015-07-09 13:00:33 -04:00
parent a6916a6c6e
commit 9a271e1323
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/cmQtAutoGenerators.cxx
View File

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