From e81f50ad6649145bdad9685ffe3e33a24abcd29e Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 15 Aug 2024 17:47:54 +0200 Subject: [PATCH] Use alias QtVersions a bit more using QtVersions = QList; Change-Id: I58f8f498978a34c969bf8f8c24c29a4705cd5eff Reviewed-by: Cristian Adam --- src/plugins/android/androidconfigurations.cpp | 4 ++-- src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp | 2 +- src/plugins/qtsupport/qtkitaspect.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 0119e55e23d..ccdee4190a3 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -1209,7 +1209,7 @@ void AndroidConfigurations::removeOldToolchains() void AndroidConfigurations::removeUnusedDebuggers() { - const QList qtVersions = QtVersionManager::versions([](const QtVersion *v) { + const QtVersions qtVersions = QtVersionManager::versions([](const QtVersion *v) { return v->type() == Constants::ANDROID_QT_TYPE; }); @@ -1385,7 +1385,7 @@ void AndroidConfigurations::updateAutomaticKitList() removeUnusedDebuggers(); QHash > qtVersionsForArch; - const QList qtVersions = QtVersionManager::versions([](const QtVersion *v) { + const QtVersions qtVersions = QtVersionManager::versions([](const QtVersion *v) { return v->type() == Constants::ANDROID_QT_TYPE; }); for (const QtVersion *qtVersion : qtVersions) { diff --git a/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp b/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp index 8b3baadb20e..dde9fa1d233 100644 --- a/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp +++ b/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp @@ -285,7 +285,7 @@ QnxDeployQtLibrariesDialogPrivate::QnxDeployQtLibrariesDialogPrivate( : q(parent), m_device(device) { m_qtLibraryCombo = new QComboBox(q); - const QList qtVersions = QtVersionManager::sortVersions( + const QtVersions qtVersions = QtVersionManager::sortVersions( QtVersionManager::versions(QtVersion::isValidPredicate( equal(&QtVersion::type, QString::fromLatin1(Constants::QNX_QNX_QT))))); for (QtVersion *v : qtVersions) diff --git a/src/plugins/qtsupport/qtkitaspect.cpp b/src/plugins/qtsupport/qtkitaspect.cpp index d106a0071a4..aa5b8d4737e 100644 --- a/src/plugins/qtsupport/qtkitaspect.cpp +++ b/src/plugins/qtsupport/qtkitaspect.cpp @@ -77,7 +77,7 @@ private: IDeviceConstPtr device = BuildDeviceKitAspect::device(kit()); const FilePath deviceRoot = device->rootPath(); - const QList versionsForBuildDevice + const QtVersions versionsForBuildDevice = Utils::filtered(QtVersionManager::versions(), [device](QtVersion *qt) { return qt->qmakeFilePath().isSameDevice(device->rootPath()); });