Sanitize QDebug output

Prefer using the stream operator logic instead of using
QString::fromLatin1. Add a noquote() where a QString should be printed
without any quotes/escapes.

This also fixes the tests with Qt 5.5, where QString's are further
escaped.

Change-Id: Ie3afd14b9355101d3c0b52f30f66ec759c76526c
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp
index f46388d2d..94adbf8af 100644
--- a/src/libs/installer/settings.cpp
+++ b/src/libs/installer/settings.cpp
@@ -86,9 +86,10 @@ static void raiseError(QXmlStreamReader &reader, const QString &error, Settings:
     } else {
         QFile *xmlFile = qobject_cast<QFile*>(reader.device());
         if (xmlFile) {
-            qWarning() << QString::fromLatin1("Ignoring following settings reader error in %1, line %2, "
-                "column %3: %4").arg(xmlFile->fileName()).arg(reader.lineNumber()).arg(reader.columnNumber())
-                .arg(error);
+            qWarning().noquote().nospace()
+                    << "Ignoring following settings reader error in " << xmlFile->fileName()
+                                 << ", line " << reader.lineNumber() << ", column " << reader.columnNumber()
+                                 << ": " << error;
         } else {
             qWarning("Ignoring following settings reader error: %s", qPrintable(error));
         }