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

Android: Get rid of intentName arg

Browse Source 
It's always empty string.

Change-Id: Id270e7fb128bfac414929e3eb611eb26beeb3624
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Jarek Kobus
2024-07-26 14:40:24 +02:00
committed by hjk
parent 73d2249960
commit bd493d7e5a
5 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,7 +86,7 @@ public:
{ {
setId("AndroidDebugger"); setId("AndroidDebugger");
setLldbPlatform("remote-android"); setLldbPlatform("remote-android");
m_runner = new AndroidRunner(runControl, {}); m_runner = new AndroidRunner(runControl);
addStartDependency(m_runner); addStartDependency(m_runner);
} }

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

@@ -17,7 +17,7 @@ public:
{ {
setId("AndroidQmlToolingSupport"); setId("AndroidQmlToolingSupport");
auto runner = new AndroidRunner(runControl, {}); auto runner = new AndroidRunner(runControl);
addStartDependency(runner); addStartDependency(runner);
auto worker = runControl->createWorker(QmlDebug::runnerIdForRunMode(runControl->runMode())); auto worker = runControl->createWorker(QmlDebug::runnerIdForRunMode(runControl->runMode()));

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

@@ -19,12 +19,12 @@ namespace Android::Internal {
class AndroidRunSupport final : public AndroidRunner class AndroidRunSupport final : public AndroidRunner
{ {
public: public:
explicit AndroidRunSupport(RunControl *runControl, const QString &intentName = QString()); explicit AndroidRunSupport(RunControl *runControl);
~AndroidRunSupport() override; ~AndroidRunSupport() override;
}; };
AndroidRunSupport::AndroidRunSupport(RunControl *runControl, const QString &intentName) AndroidRunSupport::AndroidRunSupport(RunControl *runControl)
: AndroidRunner(runControl, intentName) : AndroidRunner(runControl)
{ {
runControl->setIcon(Utils::Icons::RUN_SMALL_TOOLBAR); runControl->setIcon(Utils::Icons::RUN_SMALL_TOOLBAR);
} }

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

@@ -28,8 +28,9 @@ using namespace Utils;
namespace Android::Internal { namespace Android::Internal {
AndroidRunner::AndroidRunner(RunControl *runControl, const QString &intentName) AndroidRunner::AndroidRunner(RunControl *runControl)
: RunWorker(runControl), m_target(runControl->target()) : RunWorker(runControl)
, m_target(runControl->target())
{ {
setId("AndroidRunner"); setId("AndroidRunner");
static const int metaTypes[] = { static const int metaTypes[] = {
@@ -39,15 +40,13 @@ AndroidRunner::AndroidRunner(RunControl *runControl, const QString &intentName)
}; };
Q_UNUSED(metaTypes) Q_UNUSED(metaTypes)
QString intent = intentName; m_packageName = AndroidManager::packageName(m_target);
if (intent.isEmpty()) const QString intentName = m_packageName + '/' + AndroidManager::activityName(m_target);
intent = AndroidManager::packageName(m_target) + '/' + AndroidManager::activityName(m_target);
m_packageName = intent.left(intent.indexOf('/')); qCDebug(androidRunnerLog) << "Intent name:" << intentName << "Package name" << m_packageName;
qCDebug(androidRunnerLog) << "Intent name:" << intent << "Package name" << m_packageName;
m_worker = new AndroidRunnerWorker(this, m_packageName); m_worker = new AndroidRunnerWorker(this, m_packageName);
m_worker->setIntentName(intent); m_worker->setIntentName(intentName);
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);

3
src/plugins/android/androidrunner.h
View File

@@ -23,8 +23,7 @@ class AndroidRunner : public ProjectExplorer::RunWorker
Q_OBJECT Q_OBJECT
public: public:
explicit AndroidRunner(ProjectExplorer::RunControl *runControl, explicit AndroidRunner(ProjectExplorer::RunControl *runControl);
const QString &intentName = QString());
~AndroidRunner() override; ~AndroidRunner() override;
Utils::Port debugServerPort() const { return m_debugServerPort; } // GDB or LLDB Utils::Port debugServerPort() const { return m_debugServerPort; } // GDB or LLDB