summaryrefslogtreecommitdiff
path: root/Source/cmQtAutoGenerators.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'Source/cmQtAutoGenerators.cxx')
-rw-r--r--Source/cmQtAutoGenerators.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 4d0b3f4ad8..d49e997875 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -202,6 +202,13 @@ std::string cmQtAutoGenerators::ListQt5RccInputs(cmSourceFile* sf,
std::string oline;
while(std::getline(ostr, oline))
{
+ // Strip CR characters rcc may have printed (possibly more than one!).
+ std::string::size_type cr = oline.find('\r');
+ if (cr != oline.npos)
+ {
+ oline = oline.substr(0, cr);
+ }
+
if (oline.empty())
{
// The output of rcc --list contains many empty lines.