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:33:07 (GMT) |
| commit | 10e8ccf6e583f8bea721906b5085ecc564095a42 (patch) | |
| tree | be0ab62159a0ea6be662770600c437a43ea5c6ec /Source/cmQtAutoGeneratorInitializer.cxx | |
| parent | 8c13f0f7eaff8fd0404dbbc9a6eab5ee2637643b (diff) | |
| download | CMake-10e8ccf6e583f8bea721906b5085ecc564095a42.zip CMake-10e8ccf6e583f8bea721906b5085ecc564095a42.tar.gz CMake-10e8ccf6e583f8bea721906b5085ecc564095a42.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.
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 225c03e..053c805 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()); |