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

Android: Transform AndroidConfig into namespace

Browse Source 
Change-Id: I1926758f3dcaffb4de11a85c0873eec7bd2d223c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Jarek Kobus
2024-05-21 13:36:49 +02:00
parent 665387bc6d
commit c9fac8ca2e
24 changed files with 555 additions and 606 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -128,7 +128,7 @@ FilePath AndroidQmlPreviewWorker::designViewerApkPath(const QString &abi) const
CommandLine AndroidQmlPreviewWorker::adbCommand(const QStringList &arguments) const
{
CommandLine cmd{androidConfig().adbToolPath()};
CommandLine cmd{AndroidConfig::adbToolPath()};
if (!m_serialNumber.isEmpty())
cmd.addArgs(AndroidDeviceInfo::adbSelector(m_serialNumber));
cmd.addArg("shell");
@@ -200,7 +200,7 @@ void AndroidQmlPreviewWorker::startLogcat()
QString args = QString("logcat --pid=%1").arg(m_viewerPid);
if (!m_logcatStartTimeStamp.isEmpty())
args += QString(" -T '%1'").arg(m_logcatStartTimeStamp);
CommandLine cmd(androidConfig().adbToolPath());
CommandLine cmd(AndroidConfig::adbToolPath());
cmd.setArguments(args);
m_logcatProcess.setCommand(cmd);
m_logcatProcess.setUseCtrlCStub(true);