summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-07-10 12:51:24 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-07-10 12:51:24 (GMT)
commit92b3bd50fe0d3a170bd4905882e1ee4512b1c914 (patch)
tree204f0d1d2ea55609b4943aa935606d0833136e3b
parent1dd96df94d13374303cd016c598581394816de27 (diff)
parent9a271e13236d81b79e3e367a6898e09d3dcf28d0 (diff)
downloadCMake-92b3bd50fe0d3a170bd4905882e1ee4512b1c914.zip
CMake-92b3bd50fe0d3a170bd4905882e1ee4512b1c914.tar.gz
CMake-92b3bd50fe0d3a170bd4905882e1ee4512b1c914.tar.bz2
Merge topic 'autorcc-qt-5.1'
9a271e13 cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)
-rw-r--r--Source/cmQtAutoGenerators.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 32b9566..58f4bf4 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());