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

Qt: Remove platformName and platformDisplayName methods

Browse Source 
Fix fallout of this in KitInformation/Kit/KitManager and the wizards.

Change-Id: I5cb88cc381dc04409401909b810940ab6dccf86a
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-11-27 16:14:14 +01:00
parent d323d595b7
commit 71b4ce6673
38 changed files with 55 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,7 +106,7 @@ static QString loadLocal(ProjectExplorer::Target *target, int apiLevel, ItemType
bool AndroidManager::supportsAndroid(const ProjectExplorer::Kit *kit)
{
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(kit);
return version && version->platformName() == QLatin1String(QtSupport::Constants::ANDROID_PLATFORM);
return version && version->targetDeviceTypes().contains(Constants::ANDROID_DEVICE_TYPE);
}
bool AndroidManager::supportsAndroid(const ProjectExplorer::Target *target)

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

@@ -147,13 +147,3 @@ QSet<Core::Id> AndroidQtVersion::targetDeviceTypes() const
{
return { Constants::ANDROID_DEVICE_TYPE };
}
QString AndroidQtVersion::platformName() const
{
return QLatin1String(QtSupport::Constants::ANDROID_PLATFORM);
}
QString AndroidQtVersion::platformDisplayName() const
{
return QLatin1String(QtSupport::Constants::ANDROID_PLATFORM_TR);
}

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

@@ -58,8 +58,6 @@ public:
QSet<Core::Id> availableFeatures() const;
QSet<Core::Id> targetDeviceTypes() const;
QString platformName() const;
QString platformDisplayName() const;
QString description() const;
QString targetArch() const;