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

Rename QtSupport::BaseQtVersion to QtVersion

Browse Source 
... and the Utils::QtVersion enum to Utils::QtMajorVersion to avoid
conflicts.

Change-Id: Ib688c67388272b7204a91444155f60b8c18a56bd
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2022-01-21 16:06:36 +01:00
parent 6cec0e2033
commit 25f5771aa4
113 changed files with 636 additions and 636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/android/androidbuildapkstep.cpp
View File

@@ -177,7 +177,7 @@ AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step)
QWidget *AndroidBuildApkWidget::createApplicationGroup()
{
QtSupport::BaseQtVersion *qt = QtSupport::QtKitAspect::qtVersion(m_step->target()->kit());
QtSupport::QtVersion *qt = QtSupport::QtKitAspect::qtVersion(m_step->target()->kit());
const int minApiSupported = AndroidManager::defaultMinimumSDK(qt);
QStringList targets = AndroidConfig::apiLevelNamesFor(AndroidConfigurations::sdkManager()->
filteredSdkPlatforms(minApiSupported));
@@ -322,7 +322,7 @@ QWidget *AndroidBuildApkWidget::createAdvancedGroup()
verboseOutputCheckBox->setChecked(m_step->verboseOutput());
auto vbox = new QVBoxLayout(group);
QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(m_step->kit());
QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(m_step->kit());
if (version && version->qtVersion() >= QtSupport::QtVersionNumber{5, 14}) {
auto buildAAB = new QCheckBox(tr("Build Android App Bundle (*.aab)"), group);
buildAAB->setChecked(m_step->buildAAB());
@@ -526,7 +526,7 @@ bool AndroidBuildApkStep::init()
reportWarningOrError(tr("Warning: Signing a debug or profile package."), Task::Warning);
}
QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(kit());
QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(kit());
if (!version) {
reportWarningOrError(tr("The Qt version for kit %1 is invalid.").arg(kit()->displayName()),
Task::Error);
@@ -751,7 +751,7 @@ void AndroidBuildApkStep::doRun()
const auto androidAbis = AndroidManager::applicationAbis(target());
const QString buildKey = target()->activeBuildKey();
QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(kit());
QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(kit());
if (!version) {
reportWarningOrError(tr("The Qt version for kit %1 is invalid.")
.arg(kit()->displayName()), Task::Error);

38
src/plugins/android/androidconfigurations.cpp
View File

@@ -368,7 +368,7 @@ void AndroidConfig::parseDependenciesJson()
}
}
QVector<int> AndroidConfig::availableNdkPlatforms(const BaseQtVersion *qtVersion) const
QVector<int> AndroidConfig::availableNdkPlatforms(const QtVersion *qtVersion) const
{
QVector<int> availableNdkPlatforms;
@@ -548,7 +548,7 @@ FilePath AndroidConfig::toolchainPathFromNdk(const FilePath &ndkLocation) const
return {};
}
FilePath AndroidConfig::toolchainPath(const BaseQtVersion *qtVersion) const
FilePath AndroidConfig::toolchainPath(const QtVersion *qtVersion) const
{
return toolchainPathFromNdk(ndkLocation(qtVersion));
}
@@ -561,7 +561,7 @@ FilePath AndroidConfig::clangPathFromNdk(const FilePath &ndkLocation) const
return path.pathAppended("bin/clang").withExecutableSuffix();
}
FilePath AndroidConfig::gdbPath(const Abi &abi, const BaseQtVersion *qtVersion) const
FilePath AndroidConfig::gdbPath(const Abi &abi, const QtVersion *qtVersion) const
{
return gdbPathFromNdk(abi, ndkLocation(qtVersion));
}
@@ -887,7 +887,7 @@ bool AndroidConfig::isValidNdk(const QString &ndkLocation) const
return true;
}
QString AndroidConfig::bestNdkPlatformMatch(int target, const BaseQtVersion *qtVersion) const
QString AndroidConfig::bestNdkPlatformMatch(int target, const QtVersion *qtVersion) const
{
target = std::max(AndroidManager::defaultMinimumSDK(qtVersion), target);
foreach (int apiLevel, availableNdkPlatforms(qtVersion)) {
@@ -944,14 +944,14 @@ void AndroidConfig::setSdkManagerToolArgs(const QStringList &args)
m_sdkManagerToolArgs = args;
}
FilePath AndroidConfig::ndkLocation(const BaseQtVersion *qtVersion) const
FilePath AndroidConfig::ndkLocation(const QtVersion *qtVersion) const
{
if (!m_defaultNdk.isEmpty())
return m_defaultNdk; // A selected default NDK is good for any Qt version
return sdkLocation().pathAppended(ndkPathFromQtVersion(*qtVersion));
}
QVersionNumber AndroidConfig::ndkVersion(const BaseQtVersion *qtVersion) const
QVersionNumber AndroidConfig::ndkVersion(const QtVersion *qtVersion) const
{
return ndkVersion(ndkLocation(qtVersion));
}
@@ -1003,13 +1003,13 @@ QVersionNumber AndroidConfig::ndkVersion(const FilePath &ndkPath) const
QStringList AndroidConfig::allEssentials() const
{
QList<BaseQtVersion *> installedVersions = QtVersionManager::versions(
[](const BaseQtVersion *v) {
QList<QtVersion *> installedVersions = QtVersionManager::versions(
[](const QtVersion *v) {
return v->targetDeviceTypes().contains(Android::Constants::ANDROID_DEVICE_TYPE);
});
QStringList allPackages(defaultEssentials());
for (const BaseQtVersion *version : installedVersions)
for (const QtVersion *version : installedVersions)
allPackages.append(essentialsFromQtVersion(*version));
allPackages.removeDuplicates();
@@ -1040,7 +1040,7 @@ bool AndroidConfig::sdkToolsOk() const
return exists && writable && sdkToolsExist;
}
QStringList AndroidConfig::essentialsFromQtVersion(const BaseQtVersion &version) const
QStringList AndroidConfig::essentialsFromQtVersion(const QtVersion &version) const
{
QtVersionNumber qtVersion = version.qtVersion();
for (const SdkForQtVersions &item : m_specificQtVersions)
@@ -1050,7 +1050,7 @@ QStringList AndroidConfig::essentialsFromQtVersion(const BaseQtVersion &version)
return m_defaultSdkDepends.essentialPackages;
}
QString AndroidConfig::ndkPathFromQtVersion(const BaseQtVersion &version) const
QString AndroidConfig::ndkPathFromQtVersion(const QtVersion &version) const
{
QtVersionNumber qtVersion(version.qtVersionString());
for (const SdkForQtVersions &item : m_specificQtVersions)
@@ -1081,7 +1081,7 @@ void AndroidConfig::setOpenJDKLocation(const FilePath &openJDKLocation)
m_openJDKLocation = openJDKLocation;
}
QString AndroidConfig::toolchainHost(const BaseQtVersion *qtVersion) const
QString AndroidConfig::toolchainHost(const QtVersion *qtVersion) const
{
return toolchainHostFromNdk(ndkLocation(qtVersion));
}
@@ -1215,12 +1215,12 @@ void AndroidConfigurations::removeOldToolChains()
void AndroidConfigurations::removeUnusedDebuggers()
{
const QList<BaseQtVersion*> qtVersions = QtVersionManager::versions([](const BaseQtVersion *v) {
const QList<QtVersion*> qtVersions = QtVersionManager::versions([](const QtVersion *v) {
return v->type() == Constants::ANDROID_QT_TYPE;
});
QVector<FilePath> uniqueNdks;
for (const BaseQtVersion *qt : qtVersions) {
for (const QtVersion *qt : qtVersions) {
FilePath ndkLocation = currentConfig().ndkLocation(qt);
if (!uniqueNdks.contains(ndkLocation))
uniqueNdks.append(ndkLocation);
@@ -1375,7 +1375,7 @@ void AndroidConfigurations::updateAutomaticKitList()
for (Kit *k : KitManager::kits()) {
if (DeviceTypeKitAspect::deviceTypeId(k) == Constants::ANDROID_DEVICE_TYPE) {
if (k->value(Constants::ANDROID_KIT_NDK).isNull() || k->value(Constants::ANDROID_KIT_SDK).isNull()) {
if (BaseQtVersion *qt = QtKitAspect::qtVersion(k)) {
if (QtVersion *qt = QtKitAspect::qtVersion(k)) {
k->setValueSilently(Constants::ANDROID_KIT_NDK, currentConfig().ndkLocation(qt).toString());
k->setValue(Constants::ANDROID_KIT_SDK, currentConfig().sdkLocation().toString());
}
@@ -1394,11 +1394,11 @@ void AndroidConfigurations::updateAutomaticKitList()
removeUnusedDebuggers();
QHash<Abi, QList<const BaseQtVersion *> > qtVersionsForArch;
const QList<BaseQtVersion*> qtVersions = QtVersionManager::versions([](const BaseQtVersion *v) {
QHash<Abi, QList<const QtVersion *> > qtVersionsForArch;
const QList<QtVersion*> qtVersions = QtVersionManager::versions([](const QtVersion *v) {
return v->type() == Constants::ANDROID_QT_TYPE;
});
for (const BaseQtVersion *qtVersion : qtVersions) {
for (const QtVersion *qtVersion : qtVersions) {
const Abis qtAbis = qtVersion->qtAbis();
if (qtAbis.empty())
continue;
@@ -1416,7 +1416,7 @@ void AndroidConfigurations::updateAutomaticKitList()
if (tc->language() != ProjectExplorer::Constants::CXX_LANGUAGE_ID)
continue;
for (const BaseQtVersion *qt : qtVersionsForArch.value(tc->targetAbi())) {
for (const QtVersion *qt : qtVersionsForArch.value(tc->targetAbi())) {
FilePath tcNdk = static_cast<const AndroidToolChain *>(tc)->ndkLocation();
if (tcNdk != currentConfig().ndkLocation(qt))
continue;

18
src/plugins/android/androidconfigurations.h
View File

@@ -100,16 +100,16 @@ public:
QStringList sdkManagerToolArgs() const;
void setSdkManagerToolArgs(const QStringList &args);
Utils::FilePath ndkLocation(const QtSupport::BaseQtVersion *qtVersion) const;
QVersionNumber ndkVersion(const QtSupport::BaseQtVersion *qtVersion) const;
Utils::FilePath ndkLocation(const QtSupport::QtVersion *qtVersion) const;
QVersionNumber ndkVersion(const QtSupport::QtVersion *qtVersion) const;
QVersionNumber ndkVersion(const Utils::FilePath &ndkPath) const;
QUrl sdkToolsUrl() const { return m_sdkToolsUrl; }
QByteArray getSdkToolsSha256() const { return m_sdkToolsSha256; }
QString ndkPathFromQtVersion(const QtSupport::BaseQtVersion &version) const;
QString ndkPathFromQtVersion(const QtSupport::QtVersion &version) const;
QStringList defaultEssentials() const;
QStringList essentialsFromQtVersion(const QtSupport::BaseQtVersion &version) const;
QStringList essentialsFromQtVersion(const QtSupport::QtVersion &version) const;
QStringList allEssentials() const;
bool allEssentialsInstalled(Internal::AndroidSdkManager *sdkManager);
bool sdkToolsOk() const;
@@ -119,7 +119,7 @@ public:
Utils::FilePath keystoreLocation() const;
QString toolchainHost(const QtSupport::BaseQtVersion *qtVersion) const;
QString toolchainHost(const QtSupport::QtVersion *qtVersion) const;
QString toolchainHostFromNdk(const Utils::FilePath &ndkPath) const;
QStringList emulatorArgs() const;
@@ -134,11 +134,11 @@ public:
Utils::FilePath sdkManagerToolPath() const;
Utils::FilePath avdManagerToolPath() const;
Utils::FilePath toolchainPath(const QtSupport::BaseQtVersion *qtVersion) const;
Utils::FilePath toolchainPath(const QtSupport::QtVersion *qtVersion) const;
Utils::FilePath toolchainPathFromNdk(const Utils::FilePath &ndkLocation) const;
Utils::FilePath clangPathFromNdk(const Utils::FilePath &ndkLocation) const;
Utils::FilePath gdbPath(const ProjectExplorer::Abi &abi, const QtSupport::BaseQtVersion *qtVersion) const;
Utils::FilePath gdbPath(const ProjectExplorer::Abi &abi, const QtSupport::QtVersion *qtVersion) const;
Utils::FilePath gdbPathFromNdk(const ProjectExplorer::Abi &abi, const Utils::FilePath &ndkLocation) const;
Utils::FilePath lldbPathFromNdk(const Utils::FilePath &ndkLocation) const;
Utils::FilePath makePathFromNdk(const Utils::FilePath &ndkLocation) const;
@@ -147,7 +147,7 @@ public:
QVector<AndroidDeviceInfo> connectedDevices(QString *error = nullptr) const;
QString bestNdkPlatformMatch(int target, const QtSupport::BaseQtVersion *qtVersion) const;
QString bestNdkPlatformMatch(int target, const QtSupport::QtVersion *qtVersion) const;
static QLatin1String toolchainPrefix(const ProjectExplorer::Abi &abi);
static QLatin1String toolsPrefix(const ProjectExplorer::Abi &abi);
@@ -188,7 +188,7 @@ private:
void parseDependenciesJson();
QVector<int> availableNdkPlatforms(const QtSupport::BaseQtVersion *qtVersion) const;
QVector<int> availableNdkPlatforms(const QtSupport::QtVersion *qtVersion) const;
Utils::FilePath m_sdkLocation;
QStringList m_sdkManagerToolArgs;

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

@@ -122,7 +122,7 @@ void AndroidDebugSupport::start()
setUseContinueInsteadOfRun(true);
setAttachPid(m_runner->pid());
QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(kit);
QtSupport::QtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(kit);
if (!Utils::HostOsInfo::isWindowsHost()
&& (qtVersion
&& AndroidConfigurations::currentConfig().ndkVersion(qtVersion)

6
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -96,7 +96,7 @@ AndroidDeployQtStep::AndroidDeployQtStep(BuildStepList *parent, Utils::Id id)
BoolAspect::LabelPlacement::AtCheckBox);
m_uninstallPreviousPackage->setValue(false);
const QtSupport::BaseQtVersion * const qt = QtSupport::QtKitAspect::qtVersion(kit());
const QtSupport::QtVersion * const qt = QtSupport::QtKitAspect::qtVersion(kit());
const bool forced = qt && qt->qtVersion() < QtSupport::QtVersionNumber(5, 4, 0);
if (forced) {
m_uninstallPreviousPackage->setValue(true);
@@ -110,7 +110,7 @@ AndroidDeployQtStep::AndroidDeployQtStep(BuildStepList *parent, Utils::Id id)
bool AndroidDeployQtStep::init()
{
QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(kit());
QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(kit());
if (!version) {
reportWarningOrError(tr("The Qt version for kit %1 is invalid.").arg(kit()->displayName()),
Task::Error);
@@ -199,7 +199,7 @@ bool AndroidDeployQtStep::init()
}
}
const QtSupport::BaseQtVersion * const qt = QtSupport::QtKitAspect::qtVersion(kit());
const QtSupport::QtVersion * const qt = QtSupport::QtKitAspect::qtVersion(kit());
if (qt && qt->supportsMultipleQtAbis() && !selectedAbis.contains(info.cpuAbi.first())) {
TaskHub::addTask(DeploymentTask(Task::Warning,
tr("Android: The main ABI of the deployment device (%1) is not selected. The app "

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

@@ -160,7 +160,7 @@ int AndroidManager::minimumSDK(const Target *target)
int AndroidManager::minimumSDK(const Kit *kit)
{
int minSdkVersion = -1;
QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(kit);
QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(kit);
if (version && version->targetDeviceTypes().contains(Constants::ANDROID_DEVICE_TYPE)) {
FilePath stockManifestFilePath = FilePath::fromUserInput(
version->prefix().toString() + "/src/android/templates/AndroidManifest.xml");
@@ -206,7 +206,7 @@ QString AndroidManager::archTriplet(const QString &abi)
QJsonObject AndroidManager::deploymentSettings(const Target *target)
{
QtSupport::BaseQtVersion *qt = QtSupport::QtKitAspect::qtVersion(target->kit());
QtSupport::QtVersion *qt = QtSupport::QtKitAspect::qtVersion(target->kit());
if (!qt)
return {};
@@ -253,7 +253,7 @@ FilePath AndroidManager::androidBuildDirectory(const Target *target)
bool AndroidManager::isQt5CmakeProject(const ProjectExplorer::Target *target)
{
const QtSupport::BaseQtVersion *qt = QtSupport::QtKitAspect::qtVersion(target->kit());
const QtSupport::QtVersion *qt = QtSupport::QtKitAspect::qtVersion(target->kit());
const bool isQt5 = qt && qt->qtVersion() < QtSupport::QtVersionNumber{6, 0, 0};
const Core::Context cmakeCtx = Core::Context(CMakeProjectManager::Constants::CMAKE_PROJECT_ID);
const bool isCmakeProject = (target->project()->projectContext() == cmakeCtx);
@@ -446,7 +446,7 @@ void AndroidManager::setDeviceApiLevel(Target *target, int level)
target->setNamedSettings(ApiLevelKey, level);
}
int AndroidManager::defaultMinimumSDK(const QtSupport::BaseQtVersion *qtVersion)
int AndroidManager::defaultMinimumSDK(const QtSupport::QtVersion *qtVersion)
{
if (qtVersion && qtVersion->qtVersion() >= QtSupport::QtVersionNumber{6, 0})
return 23;
@@ -692,7 +692,7 @@ static bool mergeGradleProperties(const QString &path, GradleProperties properti
bool AndroidManager::updateGradleProperties(Target *target, const QString &buildKey)
{
QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(target->kit());
QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(target->kit());
if (!version)
return false;

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

@@ -88,7 +88,7 @@ public:
static int minimumSDK(const ProjectExplorer::Target *target);
static int minimumSDK(const ProjectExplorer::Kit *kit);
static int defaultMinimumSDK(const QtSupport::BaseQtVersion *qtVersion);
static int defaultMinimumSDK(const QtSupport::QtVersion *qtVersion);
static QStringList applicationAbis(const ProjectExplorer::Target *target);
static QString archTriplet(const QString &abi);

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

@@ -725,7 +725,7 @@ void AndroidManifestEditorWidget::updateSdkVersions()
const int targetSdk = sdkPair.second;
const Target *target = androidTarget(m_textEditorWidget->textDocument()->filePath());
if (target) {
const QtSupport::BaseQtVersion *qt = QtSupport::QtKitAspect::qtVersion(target->kit());
const QtSupport::QtVersion *qt = QtSupport::QtKitAspect::qtVersion(target->kit());
minSdk = AndroidManager::defaultMinimumSDK(qt);
}

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

@@ -161,7 +161,7 @@ void AndroidPackageInstallationStep::doRun()
// NOTE: This is a workaround for QTCREATORBUG-24155
// Needed for Qt 5.15.0 and Qt 5.14.x versions
if (buildType() == BuildConfiguration::BuildType::Debug) {
QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(kit());
QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(kit());
if (version && version->qtVersion() >= QtSupport::QtVersionNumber{5, 14}
&& version->qtVersion() <= QtSupport::QtVersionNumber{5, 15, 0}) {
const QString assetsDebugDir = nativeAndroidBuildPath().append(

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

@@ -163,7 +163,7 @@ bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessa
void AndroidPlugin::kitsRestored()
{
const bool qtForAndroidInstalled
= !QtSupport::QtVersionManager::versions([](const QtSupport::BaseQtVersion *v) {
= !QtSupport::QtVersionManager::versions([](const QtSupport::QtVersion *v) {
return v->targetDeviceTypes().contains(Android::Constants::ANDROID_DEVICE_TYPE);
}).isEmpty();

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

@@ -73,7 +73,7 @@ bool AndroidPotentialKit::isEnabled() const
}
}
return QtSupport::QtVersionManager::version([](const QtSupport::BaseQtVersion *v) {
return QtSupport::QtVersionManager::version([](const QtSupport::QtVersion *v) {
return v->isValid() && v->type() == QString::fromLatin1(Constants::ANDROID_QT_TYPE);
});
}

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

@@ -339,7 +339,7 @@ bool AndroidQmlPreviewWorker::preparePreviewArtefacts()
FilePath AndroidQmlPreviewWorker::createQmlrcFile(const FilePath &workFolder,
const QString &basename)
{
const QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(m_rc->kit());
const QtSupport::QtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(m_rc->kit());
const FilePath rccBinary = qtVersion->rccFilePath();
QtcProcess rccProcess;
FilePath qrcPath = FilePath::fromString(basename) + ".qrc4viewer";

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

@@ -54,7 +54,7 @@ namespace Android {
namespace Internal {
AndroidQtVersion::AndroidQtVersion()
: QtSupport::BaseQtVersion()
: QtSupport::QtVersion()
, m_guard(std::make_unique<QObject>())
{
QObject::connect(AndroidConfigurations::instance(),
@@ -65,7 +65,7 @@ AndroidQtVersion::AndroidQtVersion()
bool AndroidQtVersion::isValid() const
{
if (!BaseQtVersion::isValid())
if (!QtVersion::isValid())
return false;
if (qtAbis().isEmpty())
return false;
@@ -74,7 +74,7 @@ bool AndroidQtVersion::isValid() const
QString AndroidQtVersion::invalidReason() const
{
QString tmp = BaseQtVersion::invalidReason();
QString tmp = QtVersion::invalidReason();
if (tmp.isEmpty()) {
if (AndroidConfigurations::currentConfig().ndkLocation(this).isEmpty())
return tr("NDK is not configured in Devices > Android.");
@@ -136,7 +136,7 @@ Abis AndroidQtVersion::detectQtAbis() const
void AndroidQtVersion::addToEnvironment(const Kit *k, Utils::Environment &env) const
{
BaseQtVersion::addToEnvironment(k, env);
QtVersion::addToEnvironment(k, env);
const AndroidConfig &config = AndroidConfigurations::currentConfig();
// this env vars are used by qmake mkspecs to generate makefiles (check QTDIR/mkspecs/android-g++/qmake.conf for more info)
@@ -209,12 +209,12 @@ void AndroidQtVersion::parseMkSpec(ProFileEvaluator *evaluator) const
m_minNdk = tmp;
}
}
BaseQtVersion::parseMkSpec(evaluator);
QtVersion::parseMkSpec(evaluator);
}
QSet<Utils::Id> AndroidQtVersion::availableFeatures() const
{
QSet<Utils::Id> features = QtSupport::BaseQtVersion::availableFeatures();
QSet<Utils::Id> features = QtSupport::QtVersion::availableFeatures();
features.insert(QtSupport::Constants::FEATURE_MOBILE);
features.remove(QtSupport::Constants::FEATURE_QT_CONSOLE);
features.remove(QtSupport::Constants::FEATURE_QT_WEBKIT);

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

@@ -33,7 +33,7 @@
namespace Android {
namespace Internal {
class AndroidQtVersion : public QtSupport::BaseQtVersion
class AndroidQtVersion : public QtSupport::QtVersion
{
Q_DECLARE_TR_FUNCTIONS(Android::Internal::AndroidQtVersion)

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

@@ -184,7 +184,7 @@ static QString lldbServerArch2(const QString &androidAbi)
static FilePath debugServer(bool useLldb, const Target *target)
{
QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(target->kit());
QtSupport::QtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(target->kit());
QString preferredAbi = AndroidManager::apkDevicePreferredAbi(target);
const AndroidConfig &config = AndroidConfigurations::currentConfig();
@@ -315,7 +315,7 @@ AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner, const QString &packa
<< ", After finish ADB cmds:" << m_afterFinishAdbCommands
<< ", Debug server path:" << m_debugServerPath;
QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(target->kit());
QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(target->kit());
m_useAppParamsForQmlDebugger = version->qtVersion() >= QtSupport::QtVersionNumber(5, 12);
}

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

@@ -181,12 +181,12 @@ static QList<FilePath> uniqueNdksForCurrentQtVersions()
const AndroidConfig &config = AndroidConfigurations::currentConfig();
auto androidQtVersions = QtSupport::QtVersionManager::versions(
[](const QtSupport::BaseQtVersion *v) {
[](const QtSupport::QtVersion *v) {
return v->targetDeviceTypes().contains(Android::Constants::ANDROID_DEVICE_TYPE);
});
QList<FilePath> uniqueNdks;
for (const QtSupport::BaseQtVersion *version : androidQtVersions) {
for (const QtSupport::QtVersion *version : androidQtVersions) {
FilePath ndk = config.ndkLocation(version);
if (!uniqueNdks.contains(ndk))
uniqueNdks.append(ndk);

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

@@ -253,7 +253,7 @@ CreateAndroidManifestWizard::CreateAndroidManifestWizard(BuildSystem *buildSyste
setWindowTitle(tr("Create Android Template Files Wizard"));
const QList<BuildTargetInfo> buildTargets = buildSystem->applicationTargets();
QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(buildSystem->kit());
QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(buildSystem->kit());
m_copyGradle = version && version->qtVersion() >= QtSupport::QtVersionNumber(5, 4, 0);
if (buildTargets.isEmpty()) {
@@ -300,7 +300,7 @@ void CreateAndroidManifestWizard::createAndroidTemplateFiles()
FileUtils::CopyAskingForOverwrite copy(this);
Target *target = m_buildSystem->target();
QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(target->kit());
QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(target->kit());
if (!version)
return;
if (version->qtVersion() < QtSupport::QtVersionNumber(5, 4, 0)) {

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

@@ -304,7 +304,7 @@ void JLSClient::updateProjectFiles()
if (DeviceTypeKitAspect::deviceTypeId(kit) != Android::Constants::ANDROID_DEVICE_TYPE)
return;
if (ProjectNode *node = project()->findNodeForBuildKey(target->activeBuildKey())) {
QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(kit);
QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(kit);
if (!version)
return;
const QString qtSrc = version->prefix().toString() + "/src/android/java/src";