From 1c409022b4cdfbbb571f688c7d8827e984a9ac52 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Wed, 10 Jul 2024 19:39:04 +0200 Subject: [PATCH] Android: Drop m_manifestName field inside AndroidDeployQtStep Change-Id: I14a3b92928ceabf2d634d9bf2bc6e7b81402b4d0 Reviewed-by: Alessandro Portale --- src/plugins/android/androiddeployqtstep.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index a7433de87aa..e77332ebfe8 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -159,7 +159,6 @@ private: void reportWarningOrError(const QString &message, Task::TaskType type); - FilePath m_manifestName; QString m_serialNumber; QString m_avdName; FilePath m_apkPath; @@ -317,9 +316,6 @@ bool AndroidDeployQtStep::init() emit addOutput(Tr::tr("Deploying to %1").arg(m_serialNumber), OutputFormat::NormalMessage); m_uninstallPreviousPackageRun = m_uninstallPreviousPackage(); - if (m_uninstallPreviousPackageRun) - m_manifestName = AndroidManager::manifestPath(target()); - m_useAndroiddeployqt = version->qtVersion() >= AndroidManager::firstQtWithAndroidDeployQt; if (m_useAndroiddeployqt) { const QString buildKey = target()->activeBuildKey(); @@ -330,9 +326,9 @@ bool AndroidDeployQtStep::init() } m_apkPath = FilePath::fromString(node->data(Constants::AndroidApk).toString()); if (!m_apkPath.isEmpty()) { - m_manifestName = FilePath::fromString(node->data(Constants::AndroidManifest).toString()); m_command = AndroidConfig::adbToolPath(); - AndroidManager::setManifestPath(target(), m_manifestName); + AndroidManager::setManifestPath(target(), + FilePath::fromString(node->data(Constants::AndroidManifest).toString())); } else { QString jsonFile = AndroidQtVersion::androidDeploymentSettings(target()).toString(); if (jsonFile.isEmpty()) {