aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/projectexplorer/jsonwizard
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2019-05-28 08:40:56 +0200
committerhjk <hjk@qt.io>2019-05-28 07:19:45 +0000
commit92a52a71812f6a444e3d1b0aaca02cdcf52044e2 (patch)
tree919a31ec3139b79e95f9a9d502d1c62c666f5da4 /src/plugins/projectexplorer/jsonwizard
parent7c93b26792187633816f93f74b0f0ba7ef5d8eb4 (diff)
Use Qt's QFileInfoList instead of QList<QFileInfo>
Helps to adapt to potential upstream changes in Qt 6 Change-Id: Ie154bd4fd513d46cb0493758be8943fc4581d71c Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer/jsonwizard')
-rw-r--r--src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp4
-rw-r--r--src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
index 6ef34d8ddc..6acc26a10e 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
@@ -225,7 +225,7 @@ QList<Core::IWizardFactory *> JsonWizardFactory::createWizardFactories()
const QDir::Filters filters = QDir::Dirs|QDir::Readable|QDir::NoDotAndDotDot;
const QDir::SortFlags sortflags = QDir::Name|QDir::IgnoreCase;
- QList<QFileInfo> dirs = dir.entryInfoList(filters, sortflags);
+ QFileInfoList dirs = dir.entryInfoList(filters, sortflags);
while (!dirs.isEmpty()) {
const QFileInfo dirFi = dirs.takeFirst();
@@ -285,7 +285,7 @@ QList<Core::IWizardFactory *> JsonWizardFactory::createWizardFactories()
result << factory;
} else {
- QList<QFileInfo> subDirs = current.entryInfoList(filters, sortflags);
+ QFileInfoList subDirs = current.entryInfoList(filters, sortflags);
if (!subDirs.isEmpty()) {
// There is no QList::prepend(QList)...
dirs.swap(subDirs);
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.cpp
index 01494d3dd2..9f24f00718 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.cpp
@@ -141,7 +141,7 @@ Core::GeneratedFiles JsonWizardScannerGenerator::scan(const QString &dir, const
if (!directory.exists())
return result;
- QList<QFileInfo> entries = directory.entryInfoList(QDir::AllEntries | QDir::NoDotAndDotDot,
+ QFileInfoList entries = directory.entryInfoList(QDir::AllEntries | QDir::NoDotAndDotDot,
QDir::DirsLast | QDir::Name);
foreach (const QFileInfo &fi, entries) {
const QString relativePath = base.relativeFilePath(fi.absoluteFilePath());