From 8ad4acdd30fabd3bb170f9136455cbd1b2fd0b97 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 6 Jul 2022 18:02:52 +0200 Subject: [PATCH] Android: Don't quote log lines with path names Change-Id: I70f23af46bd6c8318971b20727e4010889bdcebc Reviewed-by: Assam Boudjelthia --- src/plugins/android/androidavdmanager.cpp | 10 ++++---- src/plugins/android/androidbuildapkstep.cpp | 2 +- src/plugins/android/androidconfigurations.cpp | 7 +++--- src/plugins/android/androiddebugsupport.cpp | 4 +-- src/plugins/android/androiddeployqtstep.cpp | 3 ++- src/plugins/android/androidmanager.cpp | 9 ++++--- src/plugins/android/androidrunnerworker.cpp | 25 ++++++++++--------- src/plugins/android/androidsdkmanager.cpp | 11 ++++---- src/plugins/android/splashscreenwidget.cpp | 6 +++-- 9 files changed, 42 insertions(+), 35 deletions(-) diff --git a/src/plugins/android/androidavdmanager.cpp b/src/plugins/android/androidavdmanager.cpp index 3bbfd140065..48a3a7e30b9 100644 --- a/src/plugins/android/androidavdmanager.cpp +++ b/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 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); diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp index 868e7e4129d..a5fa17425ec 100644 --- a/src/plugins/android/androidbuildapkstep.cpp +++ b/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(); diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 8a569ab2019..7f665131855 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/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." - << ndkPath.toString(); + qCDebug(avdConfigLog).noquote() << "Cannot find ndk version. Check NDK path." + << ndkPath.toUserOutput(); return version; } diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp index 2cc37d7e931..f9f129992d2 100644 --- a/src/plugins/android/androiddebugsupport.cpp +++ b/src/plugins/android/androiddebugsupport.cpp @@ -152,7 +152,7 @@ void AndroidDebugSupport::start() solibSearchPath.append(androidLibsPath); solibSearchPath.removeDuplicates(); setSolibSearchPath(solibSearchPath); - qCDebug(androidDebugSupportLog) << "SoLibSearchPath: "< 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,9 +773,9 @@ QProcess *AndroidManager::runAdbCommandDetached(const QStringList &args, QString } QString errorStr = QString::fromUtf8(p->readAllStandardError()); - qCDebug(androidManagerLog) << "Running command (async) failed:" - << CommandLine(adb, args).toUserOutput() - << "Output:" << errorStr; + qCDebug(androidManagerLog).noquote() << "Running command (async) failed:" + << CommandLine(adb, args).toUserOutput() + << "Output:" << errorStr; if (err) *err = errorStr; return nullptr; diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp index 4734ec50244..9571aba5b6f 100644 --- a/src/plugins/android/androidrunnerworker.cpp +++ b/src/plugins/android/androidrunnerworker.cpp @@ -271,8 +271,8 @@ AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner, const QString &packa m_apiLevel = AndroidManager::deviceApiLevel(target); m_extraEnvVars = runControl->aspect()->environment; - qCDebug(androidRunWorkerLog) << "Environment variables for the app" - << m_extraEnvVars.toStringList(); + qCDebug(androidRunWorkerLog).noquote() << "Environment variables for the app" + << m_extraEnvVars.toStringList(); if (target->buildConfigurations().first()->buildType() != BuildConfiguration::BuildType::Release) m_extraAppParams = runControl->commandLine().arguments(); @@ -304,12 +304,12 @@ 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 - << ", API level:" << m_apiLevel - << ", Extra Start Args:" << m_amStartExtraArgs - << ", Before Start ADB cmds:" << m_beforeStartAdbCommands - << ", After finish ADB cmds:" << m_afterFinishAdbCommands - << ", Debug server path:" << m_debugServerPath; + qCDebug(androidRunWorkerLog).noquote() << "Device Serial:" << m_deviceSerialNumber + << ", API level:" << m_apiLevel + << ", Extra Start Args:" << m_amStartExtraArgs + << ", Before Start ADB cmds:" << m_beforeStartAdbCommands + << ", After finish ADB cmds:" << m_afterFinishAdbCommands + << ", Debug server path:" << m_debugServerPath; QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(target->kit()); m_useAppParamsForQmlDebugger = version->qtVersion() >= QtSupport::QtVersionNumber(5, 12); @@ -536,8 +536,8 @@ void Android::Internal::AndroidRunnerWorker::asyncStartLogcat() const QStringList logcatArgs = selector() << "logcat" << timeArg; const FilePath adb = AndroidConfigurations::currentConfig().adbToolPath(); - qCDebug(androidRunWorkerLog) << "Running logcat command (async):" - << CommandLine(adb, logcatArgs).toUserOutput(); + 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) m_adbLogcatProcess->setObjectName("AdbLogcatProcess"); @@ -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 jdbProcess(new QProcess, &deleter); jdbProcess->setProcessChannelMode(QProcess::MergedChannels); jdbProcess->start(jdbPath.toString(), jdbArgs); diff --git a/src/plugins/android/androidsdkmanager.cpp b/src/plugins/android/androidsdkmanager.cpp index 960509e827c..f96fa03277c 100644 --- a/src/plugins/android/androidsdkmanager.cpp +++ b/src/plugins/android/androidsdkmanager.cpp @@ -130,9 +130,9 @@ static bool sdkManagerCommand(const AndroidConfig &config, const QStringList &ar { QStringList newArgs = args; newArgs.append(sdkRootArg(config)); - qCDebug(sdkManagerLog) << "Running SDK Manager command (sync):" - << CommandLine(config.sdkManagerToolPath(), newArgs) - .toUserOutput(); + qCDebug(sdkManagerLog).noquote() << "Running SDK Manager command (sync):" + << CommandLine(config.sdkManagerToolPath(), newArgs) + .toUserOutput(); QtcProcess proc; proc.setEnvironment(AndroidConfigurations::toolsEnvironment(config)); proc.setTimeoutS(timeout); @@ -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):" - << CommandLine(config.sdkManagerToolPath(), newArgs).toUserOutput(); + qCDebug(sdkManagerLog).noquote() << "Running SDK Manager command (async):" + << CommandLine(config.sdkManagerToolPath(), newArgs) + .toUserOutput(); int offset = fi.progressValue(); QtcProcess proc; proc.setEnvironment(AndroidConfigurations::toolsEnvironment(config)); diff --git a/src/plugins/android/splashscreenwidget.cpp b/src/plugins/android/splashscreenwidget.cpp index 386e6802df2..0054e8ae639 100644 --- a/src/plugins/android/splashscreenwidget.cpp +++ b/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) {