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

Android: Drop m_manifestName field inside AndroidDeployQtStep

Browse Source 
Change-Id: I14a3b92928ceabf2d634d9bf2bc6e7b81402b4d0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Jarek Kobus
2024-07-10 19:39:04 +02:00
parent abdce9e73a
commit 1c409022b4
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -159,7 +159,6 @@ private:
void reportWarningOrError(const QString &message, Task::TaskType type); void reportWarningOrError(const QString &message, Task::TaskType type);
FilePath m_manifestName;
QString m_serialNumber; QString m_serialNumber;
QString m_avdName; QString m_avdName;
FilePath m_apkPath; FilePath m_apkPath;
@@ -317,9 +316,6 @@ bool AndroidDeployQtStep::init()
emit addOutput(Tr::tr("Deploying to %1").arg(m_serialNumber), OutputFormat::NormalMessage); emit addOutput(Tr::tr("Deploying to %1").arg(m_serialNumber), OutputFormat::NormalMessage);
m_uninstallPreviousPackageRun = m_uninstallPreviousPackage(); m_uninstallPreviousPackageRun = m_uninstallPreviousPackage();
if (m_uninstallPreviousPackageRun)
m_manifestName = AndroidManager::manifestPath(target());
m_useAndroiddeployqt = version->qtVersion() >= AndroidManager::firstQtWithAndroidDeployQt; m_useAndroiddeployqt = version->qtVersion() >= AndroidManager::firstQtWithAndroidDeployQt;
if (m_useAndroiddeployqt) { if (m_useAndroiddeployqt) {
const QString buildKey = target()->activeBuildKey(); const QString buildKey = target()->activeBuildKey();
@@ -330,9 +326,9 @@ bool AndroidDeployQtStep::init()
} }
m_apkPath = FilePath::fromString(node->data(Constants::AndroidApk).toString()); m_apkPath = FilePath::fromString(node->data(Constants::AndroidApk).toString());
if (!m_apkPath.isEmpty()) { if (!m_apkPath.isEmpty()) {
m_manifestName = FilePath::fromString(node->data(Constants::AndroidManifest).toString());
m_command = AndroidConfig::adbToolPath(); m_command = AndroidConfig::adbToolPath();
AndroidManager::setManifestPath(target(), m_manifestName); AndroidManager::setManifestPath(target(),
FilePath::fromString(node->data(Constants::AndroidManifest).toString()));
} else { } else {
QString jsonFile = AndroidQtVersion::androidDeploymentSettings(target()).toString(); QString jsonFile = AndroidQtVersion::androidDeploymentSettings(target()).toString();
if (jsonFile.isEmpty()) { if (jsonFile.isEmpty()) {