Android: Don't quote log lines with path names

Change-Id: I70f23af46bd6c8318971b20727e4010889bdcebc
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>

src/plugins/android/androidavdmanager.cpp

@@ -69,7 +69,7 @@ bool AndroidAvdManager::avdManagerCommand(const AndroidConfig &config, const QSt
     QtcProcess proc;
     Environment env = AndroidConfigurations::toolsEnvironment(config);
     proc.setEnvironment(env);
-    qCDebug(avdManagerLog) << "Running AVD Manager command:" << cmd.toUserOutput();
+    qCDebug(avdManagerLog).noquote() << "Running AVD Manager command:" << cmd.toUserOutput();
     proc.setCommand(cmd);
     proc.runBlocking();
     if (proc.result() == ProcessResult::FinishedWithSuccess) {
@@ -116,7 +116,7 @@ static CreateAvdInfo createAvdCommand(const AndroidConfig &config, const CreateA
         arguments << "-f";
 
     const FilePath avdManagerTool = config.avdManagerToolPath();
-    qCDebug(avdManagerLog)
+    qCDebug(avdManagerLog).noquote()
             << "Running AVD Manager command:" << CommandLine(avdManagerTool, arguments).toUserOutput();
     QtcProcess proc;
     proc.setProcessMode(ProcessMode::Writer);
@@ -182,7 +182,7 @@ QFuture<CreateAvdInfo> AndroidAvdManager::createAvd(CreateAvdInfo info) const
 bool AndroidAvdManager::removeAvd(const QString &name) const
 {
     const CommandLine command(m_config.avdManagerToolPath(), {"delete", "avd", "-n", name});
-    qCDebug(avdManagerLog) << "Running command (removeAvd):" << command.toUserOutput();
+    qCDebug(avdManagerLog).noquote() << "Running command (removeAvd):" << command.toUserOutput();
     QtcProcess proc;
     proc.setTimeoutS(5);
     proc.setEnvironment(AndroidConfigurations::toolsEnvironment(m_config));
@@ -298,7 +298,7 @@ bool AndroidAvdManager::startAvdAsync(const QString &avdName) const
 
     cmd.addArgs(m_config.emulatorArgs(), CommandLine::Raw);
     cmd.addArgs({"-avd", avdName});
-    qCDebug(avdManagerLog) << "Running command (startAvdAsync):" << cmd.toUserOutput();
+    qCDebug(avdManagerLog).noquote() << "Running command (startAvdAsync):" << cmd.toUserOutput();
     avdProcess->setCommand(cmd);
     avdProcess->start();
     return avdProcess->waitForStarted(-1);
@@ -339,7 +339,7 @@ bool AndroidAvdManager::isAvdBooted(const QString &device) const
     arguments << "shell" << "getprop" << "init.svc.bootanim";
 
     const CommandLine command({m_config.adbToolPath(), arguments});
-    qCDebug(avdManagerLog) << "Running command (isAvdBooted):" << command.toUserOutput();
+    qCDebug(avdManagerLog).noquote() << "Running command (isAvdBooted):" << command.toUserOutput();
     QtcProcess adbProc;
     adbProc.setTimeoutS(10);
     adbProc.setCommand(command);

src/plugins/android/androidbuildapkstep.cpp

@@ -576,7 +576,7 @@ bool AndroidBuildApkStep::init()
         m_packagePath = AndroidManager::apkPath(target());
     }
 
-    qCDebug(buildapkstepLog) << "APK or AAB path:" << m_packagePath;
+    qCDebug(buildapkstepLog).noquote() << "APK or AAB path:" << m_packagePath.toUserOutput();
 
     FilePath command = version->hostBinPath().pathAppended("androiddeployqt").withExecutableSuffix();
 

src/plugins/android/androidconfigurations.cpp

@@ -256,7 +256,8 @@ void AndroidConfig::load(const QSettings &settings)
     m_customNdkList.removeAll("");
     if (!m_defaultNdk.isEmpty() && ndkVersion(m_defaultNdk).isNull()) {
         if (avdConfigLog().isDebugEnabled())
-            qCDebug(avdConfigLog) << "Clearing invalid default NDK setting:" << m_defaultNdk.path();
+            qCDebug(avdConfigLog).noquote() << "Clearing invalid default NDK setting:"
+                                            << m_defaultNdk.toUserOutput();
         m_defaultNdk.clear();
     }
     parseDependenciesJson();
@@ -950,8 +951,8 @@ QVersionNumber AndroidConfig::ndkVersion(const FilePath &ndkPath)
 {
     QVersionNumber version;
     if (!ndkPath.exists()) {
-        qCDebug(avdConfigLog) << "Cannot find ndk version. Check NDK path."
+        qCDebug(avdConfigLog).noquote() << "Cannot find ndk version. Check NDK path."
-                              << ndkPath.toString();
+                                        << ndkPath.toUserOutput();
         return version;
     }
 

src/plugins/android/androiddebugsupport.cpp

@@ -152,7 +152,7 @@ void AndroidDebugSupport::start()
         solibSearchPath.append(androidLibsPath);
         solibSearchPath.removeDuplicates();
         setSolibSearchPath(solibSearchPath);
-        qCDebug(androidDebugSupportLog) << "SoLibSearchPath: "<<solibSearchPath;
+        qCDebug(androidDebugSupportLog).noquote() << "SoLibSearchPath: " << solibSearchPath;
         setSymbolFile(buildDir.pathAppended("app_process"));
         setSkipExecutableValidation(true);
         setUseExtendedRemote(true);
@@ -183,7 +183,7 @@ void AndroidDebugSupport::start()
             if (!sysRoot.exists())
                 sysRoot = AndroidConfig::toolchainPathFromNdk(ndkLocation) / "sysroot";
             setSysRoot(sysRoot);
-            qCDebug(androidDebugSupportLog) << "Sysroot: " << sysRoot;
+            qCDebug(androidDebugSupportLog).noquote() << "Sysroot: " << sysRoot.toUserOutput();
         }
     }
     if (isQmlDebugging()) {

src/plugins/android/androiddeployqtstep.cpp

@@ -498,7 +498,8 @@ void AndroidDeployQtStep::gatherFilesToPull()
     m_filesToPull["/system/" + libDirName + "/libc.so"] = buildDir + "libc.so";
 
     for (auto itr = m_filesToPull.constBegin(); itr != m_filesToPull.constEnd(); ++itr)
-        qCDebug(deployStepLog) << "Pulling file from device:" << itr.key() << "to:" << itr.value();
+        qCDebug(deployStepLog).noquote() << "Pulling file from device:" << itr.key()
+                                         << "to:" << itr.value();
 }
 
 void AndroidDeployQtStep::doRun()

src/plugins/android/androidmanager.cpp

@@ -761,7 +761,8 @@ QProcess *AndroidManager::runAdbCommandDetached(const QStringList &args, QString
 {
     std::unique_ptr<QProcess> p(new QProcess);
     const FilePath adb = AndroidConfigurations::currentConfig().adbToolPath();
-    qCDebug(androidManagerLog) << "Running command (async):" << CommandLine(adb, args).toUserOutput();
+    qCDebug(androidManagerLog).noquote() << "Running command (async):"
+                                         << CommandLine(adb, args).toUserOutput();
     p->start(adb.toString(), args);
     if (p->waitForStarted(500) && p->state() == QProcess::Running) {
         if (deleteOnFinish) {
@@ -772,7 +773,7 @@ QProcess *AndroidManager::runAdbCommandDetached(const QStringList &args, QString
     }
 
     QString errorStr = QString::fromUtf8(p->readAllStandardError());
-    qCDebug(androidManagerLog) << "Running command (async) failed:"
+    qCDebug(androidManagerLog).noquote() << "Running command (async) failed:"
                                          << CommandLine(adb, args).toUserOutput()
                                          << "Output:" << errorStr;
     if (err)

src/plugins/android/androidrunnerworker.cpp

@@ -271,7 +271,7 @@ AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner, const QString &packa
     m_apiLevel = AndroidManager::deviceApiLevel(target);
 
     m_extraEnvVars = runControl->aspect<EnvironmentAspect>()->environment;
-    qCDebug(androidRunWorkerLog) << "Environment variables for the app"
+    qCDebug(androidRunWorkerLog).noquote() << "Environment variables for the app"
                                            << m_extraEnvVars.toStringList();
 
     if (target->buildConfigurations().first()->buildType() != BuildConfiguration::BuildType::Release)
@@ -304,7 +304,7 @@ AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner, const QString &packa
         m_afterFinishAdbCommands.append(QString("shell %1").arg(shellCmd));
 
     m_debugServerPath = debugServer(m_useLldb, target).toString();
-    qCDebug(androidRunWorkerLog) << "Device Serial:" << m_deviceSerialNumber
+    qCDebug(androidRunWorkerLog).noquote() << "Device Serial:" << m_deviceSerialNumber
                                            << ", API level:" << m_apiLevel
                                            << ", Extra Start Args:" << m_amStartExtraArgs
                                            << ", Before Start ADB cmds:" << m_beforeStartAdbCommands
@@ -536,7 +536,7 @@ void Android::Internal::AndroidRunnerWorker::asyncStartLogcat()
 
     const QStringList logcatArgs = selector() << "logcat" << timeArg;
     const FilePath adb = AndroidConfigurations::currentConfig().adbToolPath();
-    qCDebug(androidRunWorkerLog) << "Running logcat command (async):"
+    qCDebug(androidRunWorkerLog).noquote() << "Running logcat command (async):"
                                            << CommandLine(adb, logcatArgs).toUserOutput();
     m_adbLogcatProcess->start(adb.toString(), logcatArgs);
     if (m_adbLogcatProcess->waitForStarted(500) && m_adbLogcatProcess->state() == QProcess::Running)
@@ -640,7 +640,7 @@ void AndroidRunnerWorker::asyncStartHelper()
     if (!m_extraAppParams.isEmpty()) {
         QStringList appArgs =
                 Utils::ProcessArgs::splitArgs(m_extraAppParams, Utils::OsType::OsTypeLinux);
-        qCDebug(androidRunWorkerLog) << "Using application arguments: " << appArgs;
+        qCDebug(androidRunWorkerLog).noquote() << "Using application arguments: " << appArgs;
         args << "-e" << "extraappparams"
              << QString::fromLatin1(appArgs.join(' ').toUtf8().toBase64());
     }
@@ -758,7 +758,8 @@ void AndroidRunnerWorker::handleJdbWaiting()
     QStringList jdbArgs("-connect");
     jdbArgs << QString("com.sun.jdi.SocketAttach:hostname=localhost,port=%1")
                .arg(m_localJdbServerPort.toString());
-    qCDebug(androidRunWorkerLog) << "Starting JDB:" << CommandLine(jdbPath, jdbArgs).toUserOutput();
+    qCDebug(androidRunWorkerLog).noquote()
+            << "Starting JDB:" << CommandLine(jdbPath, jdbArgs).toUserOutput();
     std::unique_ptr<QProcess, Deleter> jdbProcess(new QProcess, &deleter);
     jdbProcess->setProcessChannelMode(QProcess::MergedChannels);
     jdbProcess->start(jdbPath.toString(), jdbArgs);

src/plugins/android/androidsdkmanager.cpp

@@ -130,7 +130,7 @@ static bool sdkManagerCommand(const AndroidConfig &config, const QStringList &ar
 {
     QStringList newArgs = args;
     newArgs.append(sdkRootArg(config));
-    qCDebug(sdkManagerLog) << "Running SDK Manager command (sync):"
+    qCDebug(sdkManagerLog).noquote() << "Running SDK Manager command (sync):"
                                      << CommandLine(config.sdkManagerToolPath(), newArgs)
                                         .toUserOutput();
     QtcProcess proc;
@@ -157,8 +157,9 @@ static void sdkManagerCommand(const AndroidConfig &config, const QStringList &ar
 {
     QStringList newArgs = args;
     newArgs.append(sdkRootArg(config));
-    qCDebug(sdkManagerLog) << "Running SDK Manager command (async):"
+    qCDebug(sdkManagerLog).noquote() << "Running SDK Manager command (async):"
-                           << CommandLine(config.sdkManagerToolPath(), newArgs).toUserOutput();
+                                     << CommandLine(config.sdkManagerToolPath(), newArgs)
+                                        .toUserOutput();
     int offset = fi.progressValue();
     QtcProcess proc;
     proc.setEnvironment(AndroidConfigurations::toolsEnvironment(config));

src/plugins/android/splashscreenwidget.cpp

@@ -181,7 +181,8 @@ void SplashScreenWidget::setImageFromPath(const FilePath &imagePath, bool resize
         emit imageChanged();
     }
     else {
-        qCDebug(androidManifestEditorLog) << "Cannot save image.";
+        qCDebug(androidManifestEditorLog).noquote()
+                << "Cannot save image." << targetPath.toUserOutput();
     }
 }
 
@@ -231,7 +232,8 @@ void SplashScreenWidget::loadImage()
     }
     QImage image = QImage(targetPath.toString());
     if (image.isNull()) {
-        qCDebug(androidManifestEditorLog) << "Cannot load image.";
+        qCDebug(androidManifestEditorLog).noquote()
+                << "Cannot load image." << targetPath.toUserOutput();
         return;
     }
     if (m_showImageFullScreen) {