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, 6 insertions, 8 deletions

diff --git a/src/libs/installer/qtpatch.cpp b/src/libs/installer/qtpatch.cpp
index 88020fddb..639756454 100644
--- a/src/libs/installer/qtpatch.cpp
+++ b/src/libs/installer/qtpatch.cpp
@@ -91,8 +91,8 @@ QHash<QString, QByteArray> QtPatch::qmakeValues(const QString &qmakePath, QByteA
             if (process.exitStatus() == QProcess::CrashExit) {
                 qWarning() << qmake.absoluteFilePath() << args
                            << "crashed with exit code" << process.exitCode()
-                           << "standard output: " << output
-                           << "error output: " << process.readAllStandardError();
+                           << "standard output:" << output
+                           << "error output:" << process.readAllStandardError();
                 return qmakeValueHash;
             }
             qmakeValueHash = readQmakeOutput(output);
@@ -126,7 +126,7 @@ bool QtPatch::patchBinaryFile(const QString &fileName,
     openFileForPatching(&file);
     if (!file.isOpen()) {
         qDebug() << "qpatch: warning: file" << qPrintable(fileName) << "cannot open.";
-        qDebug() << qPrintable(file.errorString());
+        qDebug().noquote() << file.errorString();
         return false;
     }
 
@@ -174,8 +174,7 @@ bool QtPatch::patchTextFile(const QString &fileName,
     QFile file(fileName);
 
     if (!file.open(QFile::ReadOnly)) {
-        qDebug() << QString::fromLatin1("Cannot open file \"%1\" for patching: %2").arg(
-            fileName, file.errorString());
+        qDebug() << "Cannot open file" << fileName << "for patching:" << file.errorString();
         return false;
     }
 
@@ -189,7 +188,7 @@ bool QtPatch::patchTextFile(const QString &fileName,
     }
 
     if (!file.open(QFile::WriteOnly | QFile::Truncate)) {
-        qDebug() << QString::fromLatin1("File \"%1\" not writable.").arg(fileName);
+        qDebug() << "File" << fileName << "not writable.";
         return false;
     }
 
@@ -209,7 +208,6 @@ bool QtPatch::openFileForPatching(QFile *file)
         }
         return file->openMode() == QFile::ReadWrite;
     }
-    qDebug() << QString::fromLatin1("File \"%1\" is open, so it cannot be opened again.").arg(
-        file->fileName());
+    qDebug() << "File" << file->fileName() << "is open, so it cannot be opened again.";
     return false;
 }