summaryrefslogtreecommitdiffstats
path: root/Source/cmQtAutoGen.h
diff options
context:
space:
mode:
authorSebastian Holtermann <sebholt@xwmw.org>2017-11-19 11:22:49 (GMT)
committerSebastian Holtermann <sebholt@xwmw.org>2017-11-19 12:12:42 (GMT)
commitab9d5896ae43789872fca2e83d556912abb60254 (patch)
treed18add395533b65ee0c04c59cf823553a82aaa33 /Source/cmQtAutoGen.h
parent2a85b5ac768cde4a9bbe98551528c8bae1e268a8 (diff)
downloadCMake-ab9d5896ae43789872fca2e83d556912abb60254.zip
CMake-ab9d5896ae43789872fca2e83d556912abb60254.tar.gz
CMake-ab9d5896ae43789872fca2e83d556912abb60254.tar.bz2
Autogen: Detect rcc feature once during configuration
We used to detect the `rcc` features before every `rcc` list invocation wich resulted in `rcc` be called twice for every listing operation. Now we detect the `rcc` list capabilities once during configuration and pass it to the cmake_autorcc target in the info file.
Diffstat (limited to 'Source/cmQtAutoGen.h')
-rw-r--r--Source/cmQtAutoGen.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmQtAutoGen.h b/Source/cmQtAutoGen.h
index acc092f..e769e93 100644
--- a/Source/cmQtAutoGen.h
+++ b/Source/cmQtAutoGen.h
@@ -61,9 +61,9 @@ public:
/// @brief Reads the resource files list from from a .qrc file
/// @arg fileName Must be the absolute path of the .qrc file
- /// @return True if the rcc file was successfully parsed
- static bool RccListInputs(std::string const& qtMajorVersion,
- std::string const& rccCommand,
+ /// @return True if the rcc file was successfully read
+ static bool RccListInputs(std::string const& rccCommand,
+ std::vector<std::string> const& rccListOptions,
std::string const& fileName,
std::vector<std::string>& files,
std::string* errorMessage = nullptr);