From 7f79bec02c32027be04eca757a6bc24374f2164b Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Wed, 10 Jul 2024 19:50:31 +0200 Subject: [PATCH] Android: Make m_androidABIs field local in AndroidDeployQtStep Change-Id: I7107470ddd8b8cd2e6039e8d230b516f8eb3004e Reviewed-by: Alessandro Portale --- src/plugins/android/androiddeployqtstep.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index e77332ebfe8..078c2d1abfb 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -164,7 +164,6 @@ private: FilePath m_apkPath; QList m_filesToPull; - QStringList m_androidABIs; BoolAspect m_uninstallPreviousPackage{this}; bool m_uninstallPreviousPackageRun = false; bool m_useAndroiddeployqt = false; @@ -212,8 +211,8 @@ bool AndroidDeployQtStep::init() m_androiddeployqtArgs = {}; - m_androidABIs = AndroidManager::applicationAbis(target()); - if (m_androidABIs.isEmpty()) { + const QStringList androidABIs = AndroidManager::applicationAbis(target()); + if (androidABIs.isEmpty()) { reportWarningOrError(Tr::tr("No Android architecture (ABI) is set by the project."), Task::Error); return false; @@ -232,7 +231,7 @@ bool AndroidDeployQtStep::init() auto androidBuildApkStep = bc->buildSteps()->firstOfType(); const int minTargetApi = AndroidManager::minimumSDK(target()); - qCDebug(deployStepLog) << "Target architecture:" << m_androidABIs + qCDebug(deployStepLog) << "Target architecture:" << androidABIs << "Min target API" << minTargetApi; // Try to re-use user-provided information from an earlier step of the same type.