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

Android: Pull androiddeployqt .json name retrieval into extra function

Browse Source 
The name of the android-*-deployment-settings.json file will be required
in other places.

This factors AndroidQtVersion::androidDeploymentSettingsFileName out of
AndroidQtVersion::androidDeploymentSettings.

Change-Id: I41d4c978adb94776df7621369dbe545faabf81ac
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Alessandro Portale
2023-09-27 12:06:31 +02:00
parent bda5c6a228
commit 7c446268b9
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/android/androidqtversion.cpp
View File

@@ -133,6 +133,20 @@ int AndroidQtVersion::minimumNDK() const
return m_minNdk;
}
QString AndroidQtVersion::androidDeploymentSettingsFileName(const Target *target)
{
const BuildSystem *bs = target->buildSystem();
if (!bs)
return {};
const QString buildKey = target->activeBuildKey();
const QString displayName = bs->buildTarget(buildKey).displayName;
const QString fileName = AndroidManager::isQt5CmakeProject(target)
? QLatin1String("android_deployment_settings.json")
: QString::fromLatin1("android-%1-deployment-settings.json")
.arg(displayName);
return fileName;
}
Utils::FilePath AndroidQtVersion::androidDeploymentSettings(const Target *target)
{
// Try to fetch the file name from node data as provided by qmake and Qbs
@@ -145,15 +159,8 @@ Utils::FilePath AndroidQtVersion::androidDeploymentSettings(const Target *target
}
// If unavailable, construct the name by ourselves (CMake)
const BuildSystem *bs = target->buildSystem();
if (!bs)
return {};
const QString displayName = bs->buildTarget(buildKey).displayName;
return AndroidManager::buildDirectory(target).pathAppended(
AndroidManager::isQt5CmakeProject(target)
? QLatin1String("android_deployment_settings.json")
: QString::fromLatin1("android-%1-deployment-settings.json")
.arg(displayName));
const QString fileName = androidDeploymentSettingsFileName(target);
return AndroidManager::buildDirectory(target) / fileName;
}
AndroidQtVersion::BuiltWith AndroidQtVersion::builtWith(bool *ok) const

1
src/plugins/android/androidqtversion.h
View File

@@ -32,6 +32,7 @@ public:
const QStringList &androidAbis() const;
int minimumNDK() const;
static QString androidDeploymentSettingsFileName(const ProjectExplorer::Target *target);
static Utils::FilePath androidDeploymentSettings(const ProjectExplorer::Target *target);
struct BuiltWith {