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, 2 insertions, 3 deletions

diff --git a/tools/binarycreator/binarycreator.cpp b/tools/binarycreator/binarycreator.cpp
index 4f400e6f2..4564b5188 100644
--- a/tools/binarycreator/binarycreator.cpp
+++ b/tools/binarycreator/binarycreator.cpp
@@ -280,8 +280,7 @@ static int assemble(Input input, const QInstaller::Settings &settings)
             qDebug() << "Creating resource archive for" << info.name;
             foreach (const QString &file, info.copiedFiles) {
                 const QSharedPointer<Resource> resource(new Resource(file));
-                qDebug() << QString::fromLatin1("Appending %1 (%2)").arg(file,
-                    humanReadableSize(resource->size()));
+                qDebug().nospace() << "Appending " << file << " (" << humanReadableSize(resource->size()) << ")";
                 collection.appendResource(resource);
             }
             input.manager.insertCollection(collection);
@@ -493,7 +492,7 @@ void copyConfigData(const QString &configFile, const QString &targetDir)
 
         const QString tagName = domElement.tagName();
         const QString elementText = domElement.text();
-        qDebug() << QString::fromLatin1("Read dom element: <%1>%2</%1>.").arg(tagName, elementText);
+        qDebug().noquote() << QString::fromLatin1("Read dom element: <%1>%2</%1>.").arg(tagName, elementText);
 
         QString newName = domElement.text().replace(QRegExp(QLatin1String("\\\\|/|\\.|:")),
             QLatin1String("_"));