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

Android: Add local runControl variable

Browse Source 
Avoid repetitive glue->runControl().

Change-Id: I970419507d24c0c572912b6b8aee9fdf43a7d6d0
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2025-06-12 10:14:41 +02:00
parent 1359e6ba61
commit dd34a50267
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -167,8 +167,9 @@ public:
static void setupStorage(RunnerStorage *storage, RunnerInterface *glue) static void setupStorage(RunnerStorage *storage, RunnerInterface *glue)
{ {
storage->m_glue = glue; storage->m_glue = glue;
auto aspect = glue->runControl()->aspectData<Debugger::DebuggerRunConfigurationAspect>(); RunControl *runControl = glue->runControl();
const Id runMode = glue->runControl()->runMode(); auto aspect = runControl->aspectData<Debugger::DebuggerRunConfigurationAspect>();
const Id runMode = runControl->runMode();
const bool debuggingMode = runMode == ProjectExplorer::Constants::DEBUG_RUN_MODE; const bool debuggingMode = runMode == ProjectExplorer::Constants::DEBUG_RUN_MODE;
storage->m_useCppDebugger = debuggingMode && aspect->useCppDebugger; storage->m_useCppDebugger = debuggingMode && aspect->useCppDebugger;
if (debuggingMode && aspect->useQmlDebugger) if (debuggingMode && aspect->useQmlDebugger)
@@ -192,27 +193,27 @@ static void setupStorage(RunnerStorage *storage, RunnerInterface *glue)
qCDebug(androidRunWorkerLog) << "QML server:" << storage->m_qmlServer.toDisplayString(); qCDebug(androidRunWorkerLog) << "QML server:" << storage->m_qmlServer.toDisplayString();
} }
BuildConfiguration *bc = glue->runControl()->buildConfiguration(); BuildConfiguration *bc = runControl->buildConfiguration();
storage->m_packageName = packageName(bc); storage->m_packageName = packageName(bc);
storage->m_intentName = storage->m_packageName + '/' + activityName(bc); storage->m_intentName = storage->m_packageName + '/' + activityName(bc);
qCDebug(androidRunWorkerLog) << "Intent name:" << storage->m_intentName qCDebug(androidRunWorkerLog) << "Intent name:" << storage->m_intentName
<< "Package name:" << storage->m_packageName; << "Package name:" << storage->m_packageName;
qCDebug(androidRunWorkerLog) << "Device API:" << glue->apiLevel(); qCDebug(androidRunWorkerLog) << "Device API:" << glue->apiLevel();
storage->m_extraEnvVars = glue->runControl()->aspectData<EnvironmentAspect>()->environment; storage->m_extraEnvVars = runControl->aspectData<EnvironmentAspect>()->environment;
qCDebug(androidRunWorkerLog).noquote() << "Environment variables for the app" qCDebug(androidRunWorkerLog).noquote() << "Environment variables for the app"
<< storage->m_extraEnvVars.toStringList(); << storage->m_extraEnvVars.toStringList();
if (bc->buildType() != BuildConfiguration::BuildType::Release) if (bc->buildType() != BuildConfiguration::BuildType::Release)
storage->m_extraAppParams = glue->runControl()->commandLine().arguments(); storage->m_extraAppParams = runControl->commandLine().arguments();
if (const Store sd = glue->runControl()->settingsData(Constants::ANDROID_AM_START_ARGS); if (const Store sd = runControl->settingsData(Constants::ANDROID_AM_START_ARGS);
!sd.isEmpty()) { !sd.isEmpty()) {
QTC_CHECK(sd.first().typeId() == QMetaType::QString); QTC_CHECK(sd.first().typeId() == QMetaType::QString);
storage->m_amStartExtraArgs = sd.first().toString(); storage->m_amStartExtraArgs = sd.first().toString();
} }
if (const Store sd = glue->runControl()->settingsData(Constants::ANDROID_PRESTARTSHELLCMDLIST); if (const Store sd = runControl->settingsData(Constants::ANDROID_PRESTARTSHELLCMDLIST);
!sd.isEmpty()) { !sd.isEmpty()) {
const QVariant &first = sd.first(); const QVariant &first = sd.first();
QTC_CHECK(first.typeId() == QMetaType::QStringList); QTC_CHECK(first.typeId() == QMetaType::QStringList);
@@ -221,7 +222,7 @@ static void setupStorage(RunnerStorage *storage, RunnerInterface *glue)
storage->m_beforeStartAdbCommands.append(QString("shell %1").arg(shellCmd)); storage->m_beforeStartAdbCommands.append(QString("shell %1").arg(shellCmd));
} }
if (const Store sd = glue->runControl()->settingsData(Constants::ANDROID_POSTFINISHSHELLCMDLIST); if (const Store sd = runControl->settingsData(Constants::ANDROID_POSTFINISHSHELLCMDLIST);
!sd.isEmpty()) { !sd.isEmpty()) {
const QVariant &first = sd.first(); const QVariant &first = sd.first();
QTC_CHECK(first.typeId() == QMetaType::QStringList); QTC_CHECK(first.typeId() == QMetaType::QStringList);