diff options
| author | Brad King <brad.king@kitware.com> | 2015-07-09 13:00:33 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-07-09 13:02:07 -0400 |
| commit | 9a271e13236d81b79e3e367a6898e09d3dcf28d0 (patch) | |
| tree | 807f455868488196470427343ba0e2bfed7c7535 /Source/cmQtAutoGenerators.cxx | |
| parent | a6916a6c6e397bda8b381f65dbfc59d3c52f8525 (diff) | |
| download | cmake-9a271e13236d81b79e3e367a6898e09d3dcf28d0.tar.gz | |
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.
Diffstat (limited to 'Source/cmQtAutoGenerators.cxx')
| -rw-r--r-- | Source/cmQtAutoGenerators.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index cbb06cde30..c4b0aa401c 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -190,7 +190,7 @@ std::string cmQtAutoGenerators::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()); |