diff options
| author | Brad King <brad.king@kitware.com> | 2015-10-29 12:42:19 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-10-29 12:42:19 (GMT) |
| commit | e14709e5a5379f0a6fa2434551211b66561ad540 (patch) | |
| tree | 1853ce9efd12333c5258ee88a9da321458fd7e6f /Source/cmQtAutoGeneratorInitializer.cxx | |
| parent | fbb8d086ba864ce6b12a9fc01e39329ba0152bf9 (diff) | |
| parent | 5ba3209247b7c7e4e4cc7c38b8702bee4879d50f (diff) | |
| download | CMake-e14709e5a5379f0a6fa2434551211b66561ad540.zip CMake-e14709e5a5379f0a6fa2434551211b66561ad540.tar.gz CMake-e14709e5a5379f0a6fa2434551211b66561ad540.tar.bz2 | |
Merge topic 'revert-autorcc-qt-5.1'
5ba32092 Merge branch 'backport-revert-autorcc-qt-5.1' into revert-autorcc-qt-5.1
10e8ccf6 Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)"
b935db3a Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)"
Diffstat (limited to 'Source/cmQtAutoGeneratorInitializer.cxx')
| -rw-r--r-- | Source/cmQtAutoGeneratorInitializer.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx index b813c14..ef146cb 100644 --- a/Source/cmQtAutoGeneratorInitializer.cxx +++ b/Source/cmQtAutoGeneratorInitializer.cxx @@ -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()); |