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

Android: Use device types as restrictions on project configurations

Browse Source 
Change-Id: I3f7ff05f27c76dadec9a9ff0ae02848830655472
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
This commit is contained in:
hjk
2017-12-19 10:32:39 +01:00
parent 4a66cae854
commit 36f720907c
15 changed files with 60 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/android/androidmanager.cpp
View File

@@ -102,17 +102,6 @@ AndroidQtSupport::~AndroidQtSupport()
g_androidQtSupportProviders.removeOne(this);
}
bool AndroidManager::supportsAndroid(const ProjectExplorer::Kit *kit)
{
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(kit);
return version && version->targetDeviceTypes().contains(Constants::ANDROID_DEVICE_TYPE);
}
bool AndroidManager::supportsAndroid(const ProjectExplorer::Target *target)
{
return supportsAndroid(target->kit());
}
QString AndroidManager::packageName(ProjectExplorer::Target *target)
{
QDomDocument doc;
@@ -165,8 +154,8 @@ int AndroidManager::minimumSDK(ProjectExplorer::Target *target)
int AndroidManager::minimumSDK(const ProjectExplorer::Kit *kit)
{
int minSDKVersion = -1;
if (supportsAndroid(kit)) {
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(kit);
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(kit);
if (version && version->targetDeviceTypes().contains(Constants::ANDROID_DEVICE_TYPE)) {
Utils::FileName stockManifestFilePath =
Utils::FileName::fromUserInput(version->qmakeProperty("QT_INSTALL_PREFIX") +
QLatin1String("/src/android/templates/AndroidManifest.xml"));