diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2016-11-30 09:19:33 (GMT) |
|---|---|---|
| committer | Sebastian Holtermann <sebholt@xwmw.org> | 2016-12-06 14:59:25 (GMT) |
| commit | 9eba41479bc9f60cd810fa1786cb3baf3d570266 (patch) | |
| tree | 1a82d8ed93c35ee3403433b45736b240c2ea4494 /Source/cmQtAutoGeneratorInitializer.cxx | |
| parent | 693d85f8d62d63ddf860637c69b8b239e7f22ad8 (diff) | |
| download | CMake-9eba41479bc9f60cd810fa1786cb3baf3d570266.zip CMake-9eba41479bc9f60cd810fa1786cb3baf3d570266.tar.gz CMake-9eba41479bc9f60cd810fa1786cb3baf3d570266.tar.bz2 | |
QtAutogen: Rcc related function rename
Diffstat (limited to 'Source/cmQtAutoGeneratorInitializer.cxx')
| -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()) { |