diff options
Diffstat (limited to 'Source/cmQtAutoGen.cxx')
| -rw-r--r-- | Source/cmQtAutoGen.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Source/cmQtAutoGen.cxx b/Source/cmQtAutoGen.cxx index 57fcd2da76..9584e5c41a 100644 --- a/Source/cmQtAutoGen.cxx +++ b/Source/cmQtAutoGen.cxx @@ -24,7 +24,8 @@ /// @arg valueOpts list of options that accept a value void MergeOptions(std::vector<std::string>& baseOpts, std::vector<std::string> const& newOpts, - std::initializer_list<cm::string_view> valueOpts, bool isQt5) + std::initializer_list<cm::string_view> valueOpts, + bool isQt5OrLater) { if (newOpts.empty()) { return; @@ -47,7 +48,7 @@ void MergeOptions(std::vector<std::string>& baseOpts, auto oit = newOpt.begin(); if (*oit == '-') { ++oit; - if (isQt5 && (*oit == '-')) { + if (isQt5OrLater && (*oit == '-')) { ++oit; } optName.assign(oit, newOpt.end()); @@ -204,24 +205,24 @@ std::string cmQtAutoGen::AppendFilenameSuffix(cm::string_view filename, void cmQtAutoGen::UicMergeOptions(std::vector<std::string>& baseOpts, std::vector<std::string> const& newOpts, - bool isQt5) + bool isQt5OrLater) { static std::initializer_list<cm::string_view> const valueOpts = { "tr", "translate", "postfix", "generator", "include", // Since Qt 5.3 "g" }; - MergeOptions(baseOpts, newOpts, valueOpts, isQt5); + MergeOptions(baseOpts, newOpts, valueOpts, isQt5OrLater); } void cmQtAutoGen::RccMergeOptions(std::vector<std::string>& baseOpts, std::vector<std::string> const& newOpts, - bool isQt5) + bool isQt5OrLater) { static std::initializer_list<cm::string_view> const valueOpts = { "name", "root", "compress", "threshold" }; - MergeOptions(baseOpts, newOpts, valueOpts, isQt5); + MergeOptions(baseOpts, newOpts, valueOpts, isQt5OrLater); } static void RccListParseContent(std::string const& content, |