Android: Move intent and package names creation into worker

Remove packageName arg from AndroidRunnerWorker c'tor.
Remove setIntentName method.
Remove m_packageName field from AndroidRunner.

Change-Id: I09f901a0db110e1deeeff5b26aef12caca0467dd
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Jarek Kobus
2024-07-26 14:52:47 +02:00
committed by hjk
parent bd493d7e5a
commit 54d3742fc0
4 changed files with 8 additions and 14 deletions

View File

@@ -40,14 +40,7 @@ AndroidRunner::AndroidRunner(RunControl *runControl)
};
Q_UNUSED(metaTypes)
m_packageName = AndroidManager::packageName(m_target);
const QString intentName = m_packageName + '/' + AndroidManager::activityName(m_target);
qCDebug(androidRunnerLog) << "Intent name:" << intentName << "Package name" << m_packageName;
m_worker = new AndroidRunnerWorker(this, m_packageName);
m_worker->setIntentName(intentName);
m_worker = new AndroidRunnerWorker(this);
m_worker->moveToThread(&m_thread);
QObject::connect(&m_thread, &QThread::finished, m_worker, &QObject::deleteLater);
@@ -108,7 +101,7 @@ void AndroidRunner::stop()
{
if (m_startAvdRunner.isRunning()) {
m_startAvdRunner.reset();
appendMessage("\n\n" + Tr::tr("\"%1\" terminated.").arg(m_packageName),
appendMessage("\n\n" + Tr::tr("\"%1\" terminated.").arg(AndroidManager::packageName(m_target)),
Utils::NormalMessageFormat);
return;
}