From 9a271e13236d81b79e3e367a6898e09d3dcf28d0 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 9 Jul 2015 13:00:33 -0400 Subject: [PATCH] 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. --- Source/cmQtAutoGenerators.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index cbb06cde3..c4b0aa401 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -190,7 +190,7 @@ std::string cmQtAutoGenerators::ListQt5RccInputs(cmSourceFile* sf, std::vector command; command.push_back(rccCommand); - command.push_back("--list"); + command.push_back("-list"); std::string absFile = cmsys::SystemTools::GetRealPath( sf->GetFullPath());