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

Android: Use more AndroidConfig specifiers for static method calls

Browse Source 
There is no need to operate on AndroidConfig instance.

Change-Id: Ie58f8e5aca8214efe0bb857b3d62a137f42a918c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Jarek Kobus
2024-05-21 11:34:05 +02:00
parent 22435ba7fb
commit 2e7da60b6c
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androiddevice.cpp
View File

@@ -860,8 +860,8 @@ void AndroidDeviceManager::handleDevicesListChange(const QString &serialNumber)
newDev->setDeviceState(state); newDev->setDeviceState(state);
newDev->setExtraData(Constants::AndroidSerialNumber, serial); newDev->setExtraData(Constants::AndroidSerialNumber, serial);
newDev->setExtraData(Constants::AndroidCpuAbi, androidConfig().getAbis(serial)); newDev->setExtraData(Constants::AndroidCpuAbi, AndroidConfig::getAbis(serial));
newDev->setExtraData(Constants::AndroidSdk, androidConfig().getSDKVersion(serial)); newDev->setExtraData(Constants::AndroidSdk, AndroidConfig::getSDKVersion(serial));
qCDebug(androidDeviceLog, "Registering new Android device id \"%s\".", qCDebug(androidDeviceLog, "Registering new Android device id \"%s\".",
newDev->id().toString().toUtf8().data()); newDev->id().toString().toUtf8().data());

4
src/plugins/android/androidqmlpreviewworker.cpp
View File

@@ -290,7 +290,7 @@ bool AndroidQmlPreviewWorker::ensureAvdIsRunning()
appendMessage(Tr::tr("Could not start AVD."), ErrorMessageFormat); appendMessage(Tr::tr("Could not start AVD."), ErrorMessageFormat);
} else { } else {
m_serialNumber = devInfoLocal.serialNumber; m_serialNumber = devInfoLocal.serialNumber;
m_avdAbis = androidConfig().getAbis(m_serialNumber); m_avdAbis = AndroidConfig::getAbis(m_serialNumber);
} }
return !devInfoLocal.serialNumber.isEmpty(); return !devInfoLocal.serialNumber.isEmpty();
} else { } else {
@@ -298,7 +298,7 @@ bool AndroidQmlPreviewWorker::ensureAvdIsRunning()
} }
return false; return false;
} }
m_avdAbis = androidConfig().getAbis(m_serialNumber); m_avdAbis = AndroidConfig::getAbis(m_serialNumber);
return true; return true;
} }

2
src/plugins/android/androidsettingswidget.cpp
View File

@@ -795,7 +795,7 @@ void AndroidSettingsWidget::updateUI()
const FilePath currentNdk = FilePath::fromUserInput(currentItem ? currentItem->text() : ""); const FilePath currentNdk = FilePath::fromUserInput(currentItem ? currentItem->text() : "");
const QString infoText = Tr::tr("(SDK Version: %1, NDK Version: %2)") const QString infoText = Tr::tr("(SDK Version: %1, NDK Version: %2)")
.arg(androidConfig().sdkToolsVersion().toString()) .arg(androidConfig().sdkToolsVersion().toString())
.arg(currentNdk.isEmpty() ? "" : androidConfig().ndkVersion(currentNdk).toString()); .arg(currentNdk.isEmpty() ? "" : AndroidConfig::ndkVersion(currentNdk).toString());
m_androidSummary->setInfoText(androidSetupOk ? infoText : ""); m_androidSummary->setInfoText(androidSetupOk ? infoText : "");
m_androidSummary->setSetupOk(androidSetupOk); m_androidSummary->setSetupOk(androidSetupOk);

10
src/plugins/android/androidtoolchain.cpp
View File

@@ -87,7 +87,7 @@ bool AndroidToolchain::isValid() const
void AndroidToolchain::addToEnvironment(Environment &env) const void AndroidToolchain::addToEnvironment(Environment &env) const
{ {
const AndroidConfig &config = androidConfig(); const AndroidConfig &config = androidConfig();
env.set(QLatin1String("ANDROID_NDK_HOST"), config.toolchainHostFromNdk(m_ndkLocation)); env.set(QLatin1String("ANDROID_NDK_HOST"), AndroidConfig::toolchainHostFromNdk(m_ndkLocation));
const FilePath javaHome = config.openJDKLocation(); const FilePath javaHome = config.openJDKLocation();
if (javaHome.exists()) { if (javaHome.exists()) {
env.set(Constants::JAVA_HOME_ENV_VAR, javaHome.toUserOutput()); env.set(Constants::JAVA_HOME_ENV_VAR, javaHome.toUserOutput());
@@ -118,7 +118,7 @@ QStringList AndroidToolchain::suggestedMkspecList() const
FilePath AndroidToolchain::makeCommand(const Environment &env) const FilePath AndroidToolchain::makeCommand(const Environment &env) const
{ {
Q_UNUSED(env) Q_UNUSED(env)
FilePath makePath = androidConfig().makePathFromNdk(m_ndkLocation); FilePath makePath = AndroidConfig::makePathFromNdk(m_ndkLocation);
return makePath.exists() ? makePath : FilePath("make"); return makePath.exists() ? makePath : FilePath("make");
} }
@@ -169,7 +169,7 @@ ToolchainList autodetectToolchainsFromNdks(
}; };
for (const FilePath &ndkLocation : ndkLocations) { for (const FilePath &ndkLocation : ndkLocations) {
FilePath clangPath = config.clangPathFromNdk(ndkLocation); const FilePath clangPath = AndroidConfig::clangPathFromNdk(ndkLocation);
if (!clangPath.exists()) { if (!clangPath.exists()) {
qCDebug(androidTCLog) << "Clang toolchains detection fails. Can not find Clang" qCDebug(androidTCLog) << "Clang toolchains detection fails. Can not find Clang"
<< clangPath; << clangPath;
@@ -193,11 +193,11 @@ ToolchainList autodetectToolchainsFromNdks(
const QString target = targetItr.key(); const QString target = targetItr.key();
Toolchain *tc = findToolchain(compilerCommand, lang, target, alreadyKnown); Toolchain *tc = findToolchain(compilerCommand, lang, target, alreadyKnown);
QLatin1String customStr = isCustom ? QLatin1String("Custom ") : QLatin1String(); const QString customStr = isCustom ? "Custom " : QString();
const QString displayName(customStr + QString("Android Clang (%1, %2, NDK %3)") const QString displayName(customStr + QString("Android Clang (%1, %2, NDK %3)")
.arg(ToolchainManager::displayNameOfLanguageId(lang), .arg(ToolchainManager::displayNameOfLanguageId(lang),
AndroidConfig::displayName(abi), AndroidConfig::displayName(abi),
config.ndkVersion(ndkLocation).toString())); AndroidConfig::ndkVersion(ndkLocation).toString()));
if (tc) { if (tc) {
// make sure to update the toolchain with current name format // make sure to update the toolchain with current name format
if (tc->displayName() != displayName) if (tc->displayName() != displayName)