mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-01 20:28:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

QtAutogen: Rcc related function rename

Browse Source
This commit is contained in:
Sebastian Holtermann
2016-11-30 10:19:33 +01:00
parent 693d85f8d6
commit 9eba41479b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmQtAutoGeneratorInitializer.cxx
View File

@@ -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()) {