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

Android: Make m_androidABIs field local in AndroidDeployQtStep

Browse Source 
Change-Id: I7107470ddd8b8cd2e6039e8d230b516f8eb3004e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Jarek Kobus
2024-07-10 19:50:31 +02:00
parent 1c409022b4
commit 7f79bec02c
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -164,7 +164,6 @@ private:
FilePath m_apkPath; FilePath m_apkPath;
QList<FileToPull> m_filesToPull; QList<FileToPull> m_filesToPull;
QStringList m_androidABIs;
BoolAspect m_uninstallPreviousPackage{this}; BoolAspect m_uninstallPreviousPackage{this};
bool m_uninstallPreviousPackageRun = false; bool m_uninstallPreviousPackageRun = false;
bool m_useAndroiddeployqt = false; bool m_useAndroiddeployqt = false;
@@ -212,8 +211,8 @@ bool AndroidDeployQtStep::init()
m_androiddeployqtArgs = {}; m_androiddeployqtArgs = {};
m_androidABIs = AndroidManager::applicationAbis(target()); const QStringList androidABIs = AndroidManager::applicationAbis(target());
if (m_androidABIs.isEmpty()) { if (androidABIs.isEmpty()) {
reportWarningOrError(Tr::tr("No Android architecture (ABI) is set by the project."), reportWarningOrError(Tr::tr("No Android architecture (ABI) is set by the project."),
Task::Error); Task::Error);
return false; return false;
@@ -232,7 +231,7 @@ bool AndroidDeployQtStep::init()
auto androidBuildApkStep = bc->buildSteps()->firstOfType<AndroidBuildApkStep>(); auto androidBuildApkStep = bc->buildSteps()->firstOfType<AndroidBuildApkStep>();
const int minTargetApi = AndroidManager::minimumSDK(target()); const int minTargetApi = AndroidManager::minimumSDK(target());
qCDebug(deployStepLog) << "Target architecture:" << m_androidABIs qCDebug(deployStepLog) << "Target architecture:" << androidABIs
<< "Min target API" << minTargetApi; << "Min target API" << minTargetApi;
// Try to re-use user-provided information from an earlier step of the same type. // Try to re-use user-provided information from an earlier step of the same type.