aboutsummaryrefslogtreecommitdiffstats
path: root/src/shared/proparser
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-05-13 20:53:49 +0200
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-10-28 13:03:17 +0000
commitb587ab70920370ea591491adeaaa91394c6d7a59 (patch)
tree70188a35d8050e1905f743eab1c8b436d6afe764 /src/shared/proparser
parent85327a4510d8d8c9d098ba791bd943100cc66a4c (diff)
trim whitespace from windows error messages
the messages contain a trailing CRLF, which is not helpful. Change-Id: I4a27115a191dc416a62e28a41f2a9c5893bdc64b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> (cherry picked from qtbase/fe9baf7e5b10dc7dfe074791d5e286a29cc33560)
Diffstat (limited to 'src/shared/proparser')
-rw-r--r--src/shared/proparser/qmakebuiltins.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/proparser/qmakebuiltins.cpp b/src/shared/proparser/qmakebuiltins.cpp
index c36fa73d8f5..d66ee6ab613 100644
--- a/src/shared/proparser/qmakebuiltins.cpp
+++ b/src/shared/proparser/qmakebuiltins.cpp
@@ -211,7 +211,7 @@ static QString windowsErrorCode()
NULL);
QString ret = QString::fromWCharArray(string);
LocalFree((HLOCAL)string);
- return ret;
+ return ret.trimmed();
}
#endif