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: Use shorter name for static function

Browse Source
This commit is contained in:
Sebastian Holtermann
2016-11-30 10:17:41 +01:00
parent 2c9667e897
commit d0283dc185
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmQtAutoGeneratorInitializer.cxx
View File

@@ -414,7 +414,7 @@ static void utilCopyTargetProperty(cmTarget* destinationTarget,
}
}
static std::string cmQtAutoGeneratorsStripCR(std::string const& line)
static std::string utilStripCR(std::string const& line)
{
// Strip CR characters rcc may have printed (possibly more than one!).
std::string::size_type cr = line.find('\r');
@@ -486,7 +486,7 @@ static bool ListQt5RccInputs(cmSourceFile* sf, cmGeneratorTarget const* target,
std::istringstream ostr(rccStdOut);
std::string oline;
while (std::getline(ostr, oline)) {
oline = cmQtAutoGeneratorsStripCR(oline);
oline = utilStripCR(oline);
if (!oline.empty()) {
depends.push_back(oline);
}
@@ -497,7 +497,7 @@ static bool ListQt5RccInputs(cmSourceFile* sf, cmGeneratorTarget const* target,
std::istringstream estr(rccStdErr);
std::string eline;
while (std::getline(estr, eline)) {
eline = cmQtAutoGeneratorsStripCR(eline);
eline = utilStripCR(eline);
if (cmHasLiteralPrefix(eline, "RCC: Error in")) {
static std::string searchString = "Cannot find file '";