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

Android: Replace RunWorker arg with RunControl

Browse Source 
Change-Id: Ic3072d3ce7d1c36a2ff333f729a4e9784e62222a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Jarek Kobus
2024-08-16 10:58:42 +02:00
parent 5fa2cc9ff5
commit 2c69ef8ddf
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,7 +103,7 @@ void AndroidRunner::startImpl(const QString &deviceSerialNumber, int apiLevel)
if (m_worker) if (m_worker)
m_worker->deleteLater(); m_worker->deleteLater();
m_worker = new AndroidRunnerWorker(this, deviceSerialNumber, apiLevel); m_worker = new AndroidRunnerWorker(runControl(), deviceSerialNumber, apiLevel);
m_worker->moveToThread(&m_thread); m_worker->moveToThread(&m_thread);
QObject::connect(&m_thread, &QThread::finished, m_worker, &QObject::deleteLater); QObject::connect(&m_thread, &QThread::finished, m_worker, &QObject::deleteLater);

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

@@ -130,14 +130,13 @@ static FilePath debugServer(bool useLldb, const Target *target)
return {}; return {};
} }
AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner, const QString &deviceSerialNumber, AndroidRunnerWorker::AndroidRunnerWorker(RunControl *runControl, const QString &deviceSerialNumber,
int apiLevel) int apiLevel)
{ {
auto runControl = runner->runControl();
m_useLldb = Debugger::DebuggerKitAspect::engineType(runControl->kit()) m_useLldb = Debugger::DebuggerKitAspect::engineType(runControl->kit())
== Debugger::LldbEngineType; == Debugger::LldbEngineType;
auto aspect = runControl->aspectData<Debugger::DebuggerRunConfigurationAspect>(); auto aspect = runControl->aspectData<Debugger::DebuggerRunConfigurationAspect>();
Utils::Id runMode = runControl->runMode(); const Id runMode = runControl->runMode();
const bool debuggingMode = runMode == ProjectExplorer::Constants::DEBUG_RUN_MODE; const bool debuggingMode = runMode == ProjectExplorer::Constants::DEBUG_RUN_MODE;
m_useCppDebugger = debuggingMode && aspect->useCppDebugger; m_useCppDebugger = debuggingMode && aspect->useCppDebugger;
if (debuggingMode && aspect->useQmlDebugger) if (debuggingMode && aspect->useQmlDebugger)

4
src/plugins/android/androidrunnerworker.h
View File

@@ -12,7 +12,7 @@
#include <utils/environment.h> #include <utils/environment.h>
namespace Android { class AndroidDeviceInfo; } namespace Android { class AndroidDeviceInfo; }
namespace ProjectExplorer { class RunWorker; } namespace ProjectExplorer { class RunControl; }
namespace Utils { class Port; } namespace Utils { class Port; }
namespace Android::Internal { namespace Android::Internal {
@@ -21,7 +21,7 @@ class AndroidRunnerWorker : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
AndroidRunnerWorker(ProjectExplorer::RunWorker *runner, const QString &deviceSerialNumber, AndroidRunnerWorker(ProjectExplorer::RunControl *runControl, const QString &deviceSerialNumber,
int apiLevel); int apiLevel);
~AndroidRunnerWorker() override; ~AndroidRunnerWorker() override;