winrtrunner: Use noquote() for all messages with file names.v5.6.0-alpha1

The quote mode causes '\' to be output as '\\'. Turn it off,
add double quotes manually and use QDir::toNativeSeparators()
consistently.

Change-Id: I1738c64aca106d7e450ab8a5a40adc9a4595f062
Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>

1 files changed, 8 insertions, 6 deletions

diff --git a/src/winrtrunner/appxengine.cpp b/src/winrtrunner/appxengine.cpp
index 258510314..b2c3d071d 100644
--- a/src/winrtrunner/appxengine.cpp
+++ b/src/winrtrunner/appxengine.cpp
@@ -281,13 +281,14 @@ bool AppxEngine::installDependencies()
 
     const QString extensionSdkDir = extensionSdkPath();
     if (!QFile::exists(extensionSdkDir)) {
-        qCWarning(lcWinRtRunner).nospace()
-                << QString(QStringLiteral("The directory '%1' does not exist.")).arg(
+        qCWarning(lcWinRtRunner).nospace().noquote()
+                << QStringLiteral("The directory \"%1\" does not exist.").arg(
                        QDir::toNativeSeparators(extensionSdkDir));
         return false;
     }
-    qCDebug(lcWinRtRunner).nospace()
-        << "looking for dependency packages in " << extensionSdkDir;
+    qCDebug(lcWinRtRunner).nospace().noquote()
+        << "looking for dependency packages in \""
+        << QDir::toNativeSeparators(extensionSdkDir) << '"';
     QDirIterator dit(extensionSdkDir, QStringList() << QStringLiteral("*.appx"),
                      QDir::Files,
                      QDirIterator::Subdirectories);
@@ -328,8 +329,9 @@ bool AppxEngine::installDependencies()
         if (d->packageArchitecture != arch)
             continue;
 
-        qCDebug(lcWinRtRunner).nospace()
-            << "installing dependency " << name << " from " << dit.filePath();
+        qCDebug(lcWinRtRunner).nospace().noquote()
+            << "installing dependency \"" << name << "\" from \""
+            << QDir::toNativeSeparators(dit.filePath()) << '"';
         if (!installPackage(manifestReader.Get(), dit.filePath())) {
             qCWarning(lcWinRtRunner) << "Failed to install package:" << name;
             return false;