소스 검색

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.
Brad King 10 년 전
부모
커밋
10e8ccf6e5
1개의 변경된 파일1개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 1
      Source/cmQtAutoGeneratorInitializer.cxx

+ 1 - 1
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());