forked from qt-creator/qt-creator
Use alias QtVersions a bit more
using QtVersions = QList<QtVersion *>; Change-Id: I58f8f498978a34c969bf8f8c24c29a4705cd5eff Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
@@ -1209,7 +1209,7 @@ void AndroidConfigurations::removeOldToolchains()
|
|||||||
|
|
||||||
void AndroidConfigurations::removeUnusedDebuggers()
|
void AndroidConfigurations::removeUnusedDebuggers()
|
||||||
{
|
{
|
||||||
const QList<QtVersion*> qtVersions = QtVersionManager::versions([](const QtVersion *v) {
|
const QtVersions qtVersions = QtVersionManager::versions([](const QtVersion *v) {
|
||||||
return v->type() == Constants::ANDROID_QT_TYPE;
|
return v->type() == Constants::ANDROID_QT_TYPE;
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -1385,7 +1385,7 @@ void AndroidConfigurations::updateAutomaticKitList()
|
|||||||
removeUnusedDebuggers();
|
removeUnusedDebuggers();
|
||||||
|
|
||||||
QHash<Abi, QList<const QtVersion *> > qtVersionsForArch;
|
QHash<Abi, QList<const QtVersion *> > qtVersionsForArch;
|
||||||
const QList<QtVersion*> qtVersions = QtVersionManager::versions([](const QtVersion *v) {
|
const QtVersions qtVersions = QtVersionManager::versions([](const QtVersion *v) {
|
||||||
return v->type() == Constants::ANDROID_QT_TYPE;
|
return v->type() == Constants::ANDROID_QT_TYPE;
|
||||||
});
|
});
|
||||||
for (const QtVersion *qtVersion : qtVersions) {
|
for (const QtVersion *qtVersion : qtVersions) {
|
||||||
|
@@ -285,7 +285,7 @@ QnxDeployQtLibrariesDialogPrivate::QnxDeployQtLibrariesDialogPrivate(
|
|||||||
: q(parent), m_device(device)
|
: q(parent), m_device(device)
|
||||||
{
|
{
|
||||||
m_qtLibraryCombo = new QComboBox(q);
|
m_qtLibraryCombo = new QComboBox(q);
|
||||||
const QList<QtVersion*> qtVersions = QtVersionManager::sortVersions(
|
const QtVersions qtVersions = QtVersionManager::sortVersions(
|
||||||
QtVersionManager::versions(QtVersion::isValidPredicate(
|
QtVersionManager::versions(QtVersion::isValidPredicate(
|
||||||
equal(&QtVersion::type, QString::fromLatin1(Constants::QNX_QNX_QT)))));
|
equal(&QtVersion::type, QString::fromLatin1(Constants::QNX_QNX_QT)))));
|
||||||
for (QtVersion *v : qtVersions)
|
for (QtVersion *v : qtVersions)
|
||||||
|
@@ -77,7 +77,7 @@ private:
|
|||||||
IDeviceConstPtr device = BuildDeviceKitAspect::device(kit());
|
IDeviceConstPtr device = BuildDeviceKitAspect::device(kit());
|
||||||
const FilePath deviceRoot = device->rootPath();
|
const FilePath deviceRoot = device->rootPath();
|
||||||
|
|
||||||
const QList<QtVersion *> versionsForBuildDevice
|
const QtVersions versionsForBuildDevice
|
||||||
= Utils::filtered(QtVersionManager::versions(), [device](QtVersion *qt) {
|
= Utils::filtered(QtVersionManager::versions(), [device](QtVersion *qt) {
|
||||||
return qt->qmakeFilePath().isSameDevice(device->rootPath());
|
return qt->qmakeFilePath().isSameDevice(device->rootPath());
|
||||||
});
|
});
|
||||||
|
Reference in New Issue
Block a user