feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Don't quote log lines with path names

Browse Source 
Change-Id: I70f23af46bd6c8318971b20727e4010889bdcebc
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Alessandro Portale
2022-07-06 18:02:52 +02:00
parent 71ec25895f
commit 8ad4acdd30
9 changed files with 42 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/android/androidavdmanager.cpp
View File

@@ -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);

2
src/plugins/android/androidbuildapkstep.cpp
View File

@@ -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();

7
src/plugins/android/androidconfigurations.cpp
View File

@@ -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;
}

4
src/plugins/android/androiddebugsupport.cpp
View File

@@ -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()) {

3
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -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()

9
src/plugins/android/androidmanager.cpp
View File

@@ -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,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;

25
src/plugins/android/androidrunnerworker.cpp
View File

@@ -271,8 +271,8 @@ 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"
<< 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<QProcess, Deleter> jdbProcess(new QProcess, &deleter);
jdbProcess->setProcessChannelMode(QProcess::MergedChannels);
jdbProcess->start(jdbPath.toString(), jdbArgs);

11
src/plugins/android/androidsdkmanager.cpp
View File

@@ -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));

6
src/plugins/android/splashscreenwidget.cpp
View File

@@ -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) {