diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmQtAutoGeneratorInitializer.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx index a1ad8d2..3de9159 100644 --- a/Source/cmQtAutoGeneratorInitializer.cxx +++ b/Source/cmQtAutoGeneratorInitializer.cxx @@ -372,7 +372,7 @@ static std::string GetRccExecutable(cmGeneratorTarget const* target) return std::string(); } -static void MergeRccOptions(std::vector<std::string>& opts, +static void RccMergeOptions(std::vector<std::string>& opts, const std::vector<std::string>& fileOpts, bool isQt5) { @@ -601,7 +601,7 @@ static void RccSetupAutoTarget(cmGeneratorTarget const* target) if (const char* prop = sf->GetProperty("AUTORCC_OPTIONS")) { std::vector<std::string> optsVec; cmSystemTools::ExpandListArgument(prop, optsVec); - MergeRccOptions(rccOptions, optsVec, strcmp(qtVersion, "5") == 0); + RccMergeOptions(rccOptions, optsVec, strcmp(qtVersion, "5") == 0); } if (!rccOptions.empty()) { |