diff options
| author | Brad King <brad.king@kitware.com> | 2015-10-27 19:12:05 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-10-27 20:30:20 (GMT) |
| commit | b935db3a113f7ee6e993ad7722269efd5ad2600e (patch) | |
| tree | 5535ddebb5c1e8b9b053d1be920d65585063196a | |
| parent | 3187de20fd9949ab90df4651f5d1ae0d218a9afd (diff) | |
| download | CMake-b935db3a113f7ee6e993ad7722269efd5ad2600e.zip CMake-b935db3a113f7ee6e993ad7722269efd5ad2600e.tar.gz CMake-b935db3a113f7ee6e993ad7722269efd5ad2600e.tar.bz2 | |
Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)"
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.
| -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 24e7ed8..d52ab78 100644 --- a/Source/cmQtAutoGeneratorInitializer.cxx +++ b/Source/cmQtAutoGeneratorInitializer.cxx @@ -86,7 +86,7 @@ std::string cmQtAutoGeneratorInitializer::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()); |