Fix deprecation warnings about deprecated container conversions

Fix warnings introduced by
qtbase/92f984273262531f909ede17a324f546fe502b5c.

Change-Id: Iaca85ad36591f7208f63305b885e7ff59c014a72
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
 

19 files changed, 75 insertions, 52 deletions

diff --git a/src/assistant/qhelpgenerator/helpgenerator.cpp b/src/assistant/qhelpgenerator/helpgenerator.cpp
index f5493a59b..feab1e2d5 100644
--- a/src/assistant/qhelpgenerator/helpgenerator.cpp
+++ b/src/assistant/qhelpgenerator/helpgenerator.cpp
@@ -428,14 +428,14 @@ bool HelpGeneratorPrivate::insertFiles(const QStringList &files, const QString &
         return false;
 
     emit statusChanged(tr("Insert files..."));
-    QList<int> filterAtts;
+    QSet<int> filterAtts;
     for (const QString &filterAtt : filterAttributes) {
         m_query->prepare(QLatin1String("SELECT Id FROM FilterAttributeTable "
             "WHERE Name=?"));
         m_query->bindValue(0, filterAtt);
         m_query->exec();
         if (m_query->next())
-            filterAtts.append(m_query->value(0).toInt());
+            filterAtts.insert(m_query->value(0).toInt());
     }
 
     int filterSetId = -1;
@@ -504,8 +504,8 @@ bool HelpGeneratorPrivate::insertFiles(const QStringList &files, const QString &
             fileNameDataList.append(fileNameData);
 
             m_fileMap.insert(fileName, tableFileId);
-            m_fileFilterMap.insert(tableFileId, filterAtts.toSet());
-            tmpFileFilterMap.insert(tableFileId, filterAtts.toSet());
+            m_fileFilterMap.insert(tableFileId, filterAtts);
+            tmpFileFilterMap.insert(tableFileId, filterAtts);
 
             ++tableFileId;
         } else {
@@ -525,7 +525,7 @@ bool HelpGeneratorPrivate::insertFiles(const QStringList &files, const QString &
     if (!tmpFileFilterMap.isEmpty()) {
         m_query->exec(QLatin1String("BEGIN"));
         for (auto it = tmpFileFilterMap.cbegin(), end = tmpFileFilterMap.cend(); it != end; ++it) {
-            QList<int> filterValues = it.value().toList();
+            QList<int> filterValues = it.value().values();
             std::sort(filterValues.begin(), filterValues.end());
             for (int fv : qAsConst(filterValues)) {
                 m_query->prepare(QLatin1String("INSERT INTO FileFilterTable "
diff --git a/src/designer/src/components/formeditor/formwindow.cpp b/src/designer/src/components/formeditor/formwindow.cpp
index 0ebb5b14a..9f988273a 100644
--- a/src/designer/src/components/formeditor/formwindow.cpp
+++ b/src/designer/src/components/formeditor/formwindow.cpp
@@ -713,7 +713,7 @@ bool FormWindow::handleMouseMoveEvent(QWidget *, QWidget *, QMouseEvent *e)
         widget_set.insert(current);
     }
 
-    sel = widget_set.toList();
+    sel = widget_set.values();
     QDesignerFormWindowCursorInterface *c = cursor();
     QWidget *current = c->current();
     if (sel.contains(current)) {
diff --git a/src/designer/src/components/objectinspector/objectinspector.cpp b/src/designer/src/components/objectinspector/objectinspector.cpp
index c74b2110f..f8a004e51 100644
--- a/src/designer/src/components/objectinspector/objectinspector.cpp
+++ b/src/designer/src/components/objectinspector/objectinspector.cpp
@@ -433,10 +433,11 @@ bool ObjectInspector::ObjectInspectorPrivate::selectObject(QObject *o)
         return false;
 
     QItemSelectionModel *selectionModel = m_treeView->selectionModel();
-    const ModelIndexSet currentSelectedItems = selectionModel->selectedRows(0).toSet();
+    const auto currentSelectedItemList = selectionModel->selectedRows(0);
+    const ModelIndexSet currentSelectedItems(currentSelectedItemList.cbegin(), currentSelectedItemList.cend());
 
     // Change in selection?
-    if (!currentSelectedItems.empty() && currentSelectedItems == objectIndexes.toSet())
+    if (!currentSelectedItems.empty() && currentSelectedItems == ModelIndexSet(objectIndexes.cbegin(), objectIndexes.cend()))
         return true;
 
     // do select and update
diff --git a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
index f12302ba1..9ee316e18 100644
--- a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
+++ b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
@@ -157,7 +157,8 @@ void  WidgetBoxTreeWidget::restoreExpandedState()
     const QString groupKey = QLatin1String(widgetBoxSettingsGroupC) + QLatin1Char('/');
     m_iconMode = settings->value(groupKey + QLatin1String(widgetBoxViewModeKeyC)).toBool();
     updateViewMode();
-    const StringSet closedCategories = settings->value(groupKey + QLatin1String(widgetBoxExpandedKeyC), QStringList()).toStringList().toSet();
+    const auto &closedCategoryList = settings->value(groupKey + QLatin1String(widgetBoxExpandedKeyC), QStringList()).toStringList();
+    const StringSet closedCategories(closedCategoryList.cbegin(), closedCategoryList.cend());
     expandAll();
     if (closedCategories.empty())
         return;
diff --git a/src/designer/src/lib/shared/actionrepository.cpp b/src/designer/src/lib/shared/actionrepository.cpp
index 1d1c2cd8c..cc282ab7b 100644
--- a/src/designer/src/lib/shared/actionrepository.cpp
+++ b/src/designer/src/lib/shared/actionrepository.cpp
@@ -234,7 +234,7 @@ QMimeData *ActionModel::mimeData(const QModelIndexList &indexes ) const
         if (QStandardItem *item = itemFromIndex(index))
             if (QAction *action = actionOfItem(item))
                 actions.insert(action);
-    return new ActionRepositoryMimeData(actions.toList(), Qt::CopyAction);
+    return new ActionRepositoryMimeData(actions.values(), Qt::CopyAction);
 }
 
 // Resource images are plain text. The drag needs to be restricted, however.
diff --git a/src/designer/src/lib/shared/formwindowbase.cpp b/src/designer/src/lib/shared/formwindowbase.cpp
index 713d32850..47f64829b 100644
--- a/src/designer/src/lib/shared/formwindowbase.cpp
+++ b/src/designer/src/lib/shared/formwindowbase.cpp
@@ -115,8 +115,11 @@ FormWindowBase::FormWindowBase(QDesignerFormEditorInterface *core, QWidget *pare
 
 FormWindowBase::~FormWindowBase()
 {
-    QSet<QDesignerPropertySheet *> sheets = m_d->m_reloadableResources.keys().toSet();
-    sheets |= m_d->m_reloadablePropertySheets.keys().toSet();
+    QSet<QDesignerPropertySheet *> sheets;
+    for (auto it = m_d->m_reloadableResources.cbegin(), end = m_d->m_reloadableResources.cend(); it != end; ++it)
+        sheets.insert(it.key());
+    for (auto it = m_d->m_reloadablePropertySheets.cbegin(), end = m_d->m_reloadablePropertySheets.cend(); it != end; ++it)
+        sheets.insert(it.key());
 
     m_d->m_reloadableResources.clear();
     m_d->m_reloadablePropertySheets.clear();
diff --git a/src/designer/src/lib/shared/pluginmanager.cpp b/src/designer/src/lib/shared/pluginmanager.cpp
index c4a770e02..4bca2a637 100644
--- a/src/designer/src/lib/shared/pluginmanager.cpp
+++ b/src/designer/src/lib/shared/pluginmanager.cpp
@@ -88,8 +88,8 @@ QT_BEGIN_NAMESPACE
 
 static QStringList unique(const QStringList &lst)
 {
-    const QSet<QString> s = QSet<QString>::fromList(lst);
-    return s.toList();
+    const QSet<QString> s(lst.cbegin(), lst.cend());
+    return s.values();
 }
 
 QStringList QDesignerPluginManager::defaultPluginPaths()
diff --git a/src/linguist/lupdate/cpp.cpp b/src/linguist/lupdate/cpp.cpp
index e96e102af..eb0549cee 100644
--- a/src/linguist/lupdate/cpp.cpp
+++ b/src/linguist/lupdate/cpp.cpp
@@ -1376,7 +1376,7 @@ void CppParser::processInclude(const QString &file, ConversionData &cd, const QS
 
     const int index = includeStack.indexOf(cleanFile);
     if (index != -1) {
-        CppFiles::addIncludeCycle(includeStack.mid(index).toSet());
+        CppFiles::addIncludeCycle(QSet<QString>(includeStack.cbegin() + index, includeStack.cend()));
         return;
     }
 
diff --git a/src/linguist/lupdate/main.cpp b/src/linguist/lupdate/main.cpp
index d9c6f7966..d74f213cc 100644
--- a/src/linguist/lupdate/main.cpp
+++ b/src/linguist/lupdate/main.cpp
@@ -529,14 +529,14 @@ static QSet<QString> projectRoots(const QString &projectFile, const QStringList
     sourceDirs.insert(proPath + QLatin1Char('/'));
     for (const QString &sf : sourceFiles)
         sourceDirs.insert(sf.left(sf.lastIndexOf(QLatin1Char('/')) + 1));
-    QStringList rootList = sourceDirs.toList();
+    QStringList rootList = sourceDirs.values();
     rootList.sort();
     for (int prev = 0, curr = 1; curr < rootList.length(); )
         if (rootList.at(curr).startsWith(rootList.at(prev)))
             rootList.removeAt(curr);
         else
             prev = curr++;
-    return rootList.toSet();
+    return QSet<QString>(rootList.cbegin(), rootList.cend());
 }
 
 class ProjectProcessor
diff --git a/src/linguist/shared/projectdescriptionreader.cpp b/src/linguist/shared/projectdescriptionreader.cpp
index 5b4a53f25..e61b81e09 100644
--- a/src/linguist/shared/projectdescriptionreader.cpp
+++ b/src/linguist/shared/projectdescriptionreader.cpp
@@ -72,18 +72,20 @@ private:
                     << QStringLiteral("sources")
                     << QStringLiteral("subProjects")
                     << QStringLiteral("translations");
-        const QSet<QString> actualKeys = project.keys().toSet();
+        QSet<QString> actualKeys;
+        for (auto it = project.constBegin(), end = project.constEnd(); it != end; ++it)
+            actualKeys.insert(it.key());
         const QSet<QString> missingKeys = requiredKeys - actualKeys;
         if (!missingKeys.isEmpty()) {
             *m_errorString = FMT::tr("Missing keys in project description: %1.").arg(
-                    missingKeys.toList().join(QLatin1String(", ")));
+                    missingKeys.values().join(QLatin1String(", ")));
             return false;
         }
         const QSet<QString> unexpected = actualKeys - allowedKeys;
         if (!unexpected.isEmpty()) {
             *m_errorString = FMT::tr("Unexpected keys in project %1: %2").arg(
                     project.value(QStringLiteral("projectFile")).toString(),
-                    unexpected.toList().join(QLatin1String(", ")));
+                    unexpected.values().join(QLatin1String(", ")));
             return false;
         }
         return isValidProjectDescription(project.value(QStringLiteral("subProjects")).toArray());
diff --git a/src/qdoc/config.cpp b/src/qdoc/config.cpp
index 64c8786f6..e24e9e72f 100644
--- a/src/qdoc/config.cpp
+++ b/src/qdoc/config.cpp
@@ -436,7 +436,8 @@ QString Config::getString(const QString& var, const QString& defaultString) cons
  */
 QSet<QString> Config::getStringSet(const QString& var) const
 {
-    return QSet<QString>::fromList(getStringList(var));
+    const auto &stringList = getStringList(var);
+    return QSet<QString>(stringList.cbegin(), stringList.cend());
 }
 
 /*!
diff --git a/src/qdoc/cppcodeparser.cpp b/src/qdoc/cppcodeparser.cpp
index f6f2eb5f2..6d5ec5af0 100644
--- a/src/qdoc/cppcodeparser.cpp
+++ b/src/qdoc/cppcodeparser.cpp
@@ -151,8 +151,10 @@ void CppCodeParser::initializeParser(const Config &config)
                 CONFIG_EXAMPLES + Config::dot + CONFIG_FILEEXTENSIONS);
 
     // Used for excluding dirs and files from the list of example files
-    excludeDirs = QSet<QString>::fromList(config.getCanonicalPathList(CONFIG_EXCLUDEDIRS));
-    excludeFiles = QSet<QString>::fromList(config.getCanonicalPathList(CONFIG_EXCLUDEFILES));
+    const auto &excludeDirsList = config.getCanonicalPathList(CONFIG_EXCLUDEDIRS);
+    excludeDirs = QSet<QString>(excludeDirsList.cbegin(), excludeDirsList.cend());
+    const auto &excludeFilesList = config.getCanonicalPathList(CONFIG_EXCLUDEDIRS);
+    excludeFiles = QSet<QString>(excludeFilesList.cbegin(), excludeFilesList.cend());
 
     if (!exampleFilePatterns.isEmpty())
         exampleNameFilter = exampleFilePatterns.join(' ');
@@ -706,7 +708,7 @@ void CppCodeParser::processMetaCommand(const Doc &doc,
  */
 void CppCodeParser::processMetaCommands(const Doc &doc, Node *node)
 {
-    QStringList metaCommandsUsed = doc.metaCommandsUsed().toList();
+    QStringList metaCommandsUsed = doc.metaCommandsUsed().values();
     metaCommandsUsed.sort(); // TODO: why are these sorted? mws 24/12/2018
     QStringList::ConstIterator cmd = metaCommandsUsed.constBegin();
     while (cmd != metaCommandsUsed.constEnd()) {
diff --git a/src/qdoc/generator.cpp b/src/qdoc/generator.cpp
index ac6577c81..b4f3f0cf2 100644
--- a/src/qdoc/generator.cpp
+++ b/src/qdoc/generator.cpp
@@ -868,7 +868,8 @@ void Generator::generateBody(const Node *node, CodeMarker *marker)
                 ++it;
             }
 
-            QSet<QString> documentedItems = enume->doc().enumItemNames().toSet();
+            const auto &documentedItemList = enume->doc().enumItemNames();
+            QSet<QString> documentedItems(documentedItemList.cbegin(), documentedItemList.cend());
             QSet<QString> allItems = definedItems + documentedItems;
             if (allItems.count() > definedItems.count() ||
                     allItems.count() > documentedItems.count()) {
diff --git a/src/qdoc/helpprojectwriter.cpp b/src/qdoc/helpprojectwriter.cpp
index 500052eb6..e7d877993 100644
--- a/src/qdoc/helpprojectwriter.cpp
+++ b/src/qdoc/helpprojectwriter.cpp
@@ -82,13 +82,14 @@ void HelpProjectWriter::reset(const Config &config,
         project.extraFiles += config.getStringSet(CONFIG_QHP + Config::dot + "extraFiles");
         project.indexTitle = config.getString(prefix + "indexTitle");
         project.indexRoot = config.getString(prefix + "indexRoot");
-        project.filterAttributes = config.getStringList(prefix + "filterAttributes").toSet();
+        const auto &filterAttributes = config.getStringList(prefix + "filterAttributes");
+        project.filterAttributes = QSet<QString>(filterAttributes.cbegin(), filterAttributes.cend());
         project.includeIndexNodes = config.getBool(prefix + "includeIndexNodes");
         QSet<QString> customFilterNames = config.subVars(prefix + "customFilters");
         foreach (const QString &filterName, customFilterNames) {
             QString name = config.getString(prefix + "customFilters" + Config::dot + filterName + Config::dot + "name");
-            QSet<QString> filters = config.getStringList(prefix + "customFilters" + Config::dot + filterName + Config::dot + "filterAttributes").toSet();
-            project.customFilters[name] = filters;
+            const auto &filters = config.getStringList(prefix + "customFilters" + Config::dot + filterName + Config::dot + "filterAttributes");
+            project.customFilters[name] = QSet<QString>(filters.cbegin(), filters.cend());
         }
         //customFilters = config.defs.
 
@@ -679,7 +680,7 @@ void HelpProjectWriter::generateProject(HelpProject &project)
     for (it = project.customFilters.constBegin(); it != project.customFilters.constEnd(); ++it) {
         writer.writeStartElement("customFilter");
         writer.writeAttribute("name", it.key());
-        QStringList sortedAttributes = it.value().toList();
+        QStringList sortedAttributes = it.value().values();
         sortedAttributes.sort();
         foreach (const QString &filter, sortedAttributes)
             writer.writeTextElement("filterAttribute", filter);
@@ -690,7 +691,7 @@ void HelpProjectWriter::generateProject(HelpProject &project)
     writer.writeStartElement("filterSection");
 
     // Write filterAttribute elements.
-    QStringList sortedFilterAttributes = project.filterAttributes.toList();
+    QStringList sortedFilterAttributes = project.filterAttributes.values();
     sortedFilterAttributes.sort();
     foreach (const QString &filterName, sortedFilterAttributes)
         writer.writeTextElement("filterAttribute", filterName);
@@ -844,10 +845,10 @@ void HelpProjectWriter::generateProject(HelpProject &project)
 
     // The list of files to write is the union of generated files and
     // other files (images and extras) included in the project
-    QSet<QString> files = QSet<QString>::fromList(gen_->outputFileNames());
+    QSet<QString> files = QSet<QString>(gen_->outputFileNames().cbegin(), gen_->outputFileNames().cend());
     files.unite(project.files);
     files.unite(project.extraFiles);
-    QStringList sortedFiles = files.toList();
+    QStringList sortedFiles = files.values();
     sortedFiles.sort();
     foreach (const QString &usedFile, sortedFiles) {
         if (!usedFile.isEmpty())
diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp
index f51e358a2..7bdb0e6e6 100644
--- a/src/qdoc/htmlgenerator.cpp
+++ b/src/qdoc/htmlgenerator.cpp
@@ -1572,12 +1572,14 @@ void HtmlGenerator::generateCppReferencePage(Aggregate *aggregate, CodeMarker *m
                 const EnumNode *enume = reinterpret_cast<const EnumNode*>(*m);
                 if (enume->flagsType())
                     names << enume->flagsType()->name();
-
-                foreach (const QString &enumName,
-                         enume->doc().enumItemNames().toSet() -
-                         enume->doc().omitEnumItemNames().toSet())
+                const auto &enumItemNameList = enume->doc().enumItemNames();
+                const auto &omitEnumItemNameList = enume->doc().omitEnumItemNames();
+                const auto items = QSet<QString>(enumItemNameList.cbegin(), enumItemNameList.cend())
+                    - QSet<QString>(omitEnumItemNameList.cbegin(), omitEnumItemNameList.cend());
+                for (const QString &enumName : items) {
                     names << plainCode(marker->markedUpEnumValue(enumName,
                                                                  enume));
+                }
             }
             ++m;
         }
@@ -1668,12 +1670,14 @@ void HtmlGenerator::generateProxyPage(Aggregate *aggregate, CodeMarker *marker)
                     const EnumNode *enume = reinterpret_cast<const EnumNode*>(*m);
                     if (enume->flagsType())
                         names << enume->flagsType()->name();
-
-                    foreach (const QString &enumName,
-                             enume->doc().enumItemNames().toSet() -
-                             enume->doc().omitEnumItemNames().toSet())
+                    const auto &enumItemNameList = enume->doc().enumItemNames();
+                    const auto &omitEnumItemNameList = enume->doc().omitEnumItemNames();
+                    const auto items = QSet<QString>(enumItemNameList.cbegin(), enumItemNameList.cend())
+                        - QSet<QString>(omitEnumItemNameList.cbegin(), omitEnumItemNameList.cend());
+                    for (const QString &enumName : items) {
                         names << plainCode(marker->markedUpEnumValue(enumName,
                                                                      enume));
+                    }
                 }
             }
             ++m;
@@ -4675,10 +4679,13 @@ void HtmlGenerator::generateManifestFile(const QString &manifest, const QString
 
         // Include tags added via \meta {tag} {tag1[,tag2,...]}
         // within \example topic
-        for (const auto &tag : en->doc().metaTagMap().values("tag"))
-            tags += QSet<QString>::fromList(tag.toLower().split(QLatin1Char(',')));
+        for (const auto &tag : en->doc().metaTagMap().values("tag")) {
+            const auto &tagList = tag.toLower().split(QLatin1Char(','));
+            tags += QSet<QString>(tagList.cbegin(), tagList.cend());
+        }
 
-        tags += QSet<QString>::fromList(en->title().toLower().split(QLatin1Char(' ')));
+        const auto &titleWords = en->title().toLower().split(QLatin1Char(' '));
+        tags += QSet<QString>(titleWords.cbegin(), titleWords.cend());
 
         // Clean up tags, exclude invalid and common words
         QSet<QString>::iterator tag_it = tags.begin();
@@ -4711,7 +4718,7 @@ void HtmlGenerator::generateManifestFile(const QString &manifest, const QString
         if (!tags.isEmpty()) {
             writer.writeStartElement("tags");
             bool wrote_one = false;
-            QStringList sortedTags = tags.toList();
+            QStringList sortedTags = tags.values();
             sortedTags.sort();
             foreach (const QString &tag, sortedTags) {
                 if (wrote_one)
diff --git a/src/qdoc/main.cpp b/src/qdoc/main.cpp
index bb62a9160..db986b6fc 100644
--- a/src/qdoc/main.cpp
+++ b/src/qdoc/main.cpp
@@ -376,8 +376,10 @@ static void processQdocconfFile(const QString &fileName)
                                         + CONFIG_LANDINGTITLE, title));
     }
 
-    QSet<QString> excludedDirs = QSet<QString>::fromList(config.getCanonicalPathList(CONFIG_EXCLUDEDIRS));
-    QSet<QString> excludedFiles = QSet<QString>::fromList(config.getCanonicalPathList(CONFIG_EXCLUDEFILES));
+    const auto &excludedDirList = config.getCanonicalPathList(CONFIG_EXCLUDEDIRS);
+    QSet<QString> excludedDirs = QSet<QString>(excludedDirList.cbegin(), excludedDirList.cend());
+    const auto &excludedFilesList = config.getCanonicalPathList(CONFIG_EXCLUDEFILES);
+    QSet<QString> excludedFiles = QSet<QString>(excludedFilesList.cbegin(), excludedFilesList.cend());
 
     qCDebug(lcQdoc, "Adding doc/image dirs found in exampledirs to imagedirs");
     QSet<QString> exampleImageDirs;
diff --git a/src/qdoc/node.cpp b/src/qdoc/node.cpp
index d418190a3..c61d1aa25 100644
--- a/src/qdoc/node.cpp
+++ b/src/qdoc/node.cpp
@@ -37,6 +37,8 @@
 #include "tokenizer.h"
 #include "puredocparser.h"
 
+#include <algorithm>
+
 QT_BEGIN_NAMESPACE
 
 int Node::propertyGroupCount_ = 0;
@@ -1199,10 +1201,10 @@ void Aggregate::normalizeOverloads()
  */
 const NodeList &Aggregate::nonfunctionList()
 {
-    std::list<Node*> list = nonfunctionMap_.values().toStdList();
-    list.sort();
-    list.unique();
-    nonfunctionList_ = NodeList::fromStdList(list);
+    nonfunctionList_ = nonfunctionMap_.values();
+    std::sort(nonfunctionList_.begin(), nonfunctionList_.end());
+    nonfunctionList_.erase(std::unique(nonfunctionList_.begin(), nonfunctionList_.end()),
+                           nonfunctionList_.end());
     return nonfunctionList_;
 }
 
diff --git a/src/qdoc/qdocindexfiles.cpp b/src/qdoc/qdocindexfiles.cpp
index 617c132f2..7d6aa5ffb 100644
--- a/src/qdoc/qdocindexfiles.cpp
+++ b/src/qdoc/qdocindexfiles.cpp
@@ -955,7 +955,7 @@ bool QDocIndexFiles::generateIndexSection(QXmlStreamWriter &writer, Node *node,
             }
             if (!baseStrings.isEmpty())
             {
-                QStringList baseStringsAsList = baseStrings.toList();
+                QStringList baseStringsAsList = baseStrings.values();
                 baseStringsAsList.sort();
                 writer.writeAttribute("bases", baseStringsAsList.join(QLatin1Char(',')));
             }
diff --git a/src/qtdiag/qtdiag.cpp b/src/qtdiag/qtdiag.cpp
index 448b3d6cb..9b082e37e 100644
--- a/src/qtdiag/qtdiag.cpp
+++ b/src/qtdiag/qtdiag.cpp
@@ -207,7 +207,7 @@ void dumpGlInfo(QTextStream &str, bool listExtensions)
         str << '\n';
 #  endif // !QT_OPENGL_ES_2
         if (listExtensions) {
-            QList<QByteArray> extensionList = context.extensions().toList();
+            QByteArrayList extensionList = context.extensions().values();
             std::sort(extensionList.begin(), extensionList.end());
             str << " \nFound " << extensionList.size() << " extensions:\n";
             for (const QByteArray &extension : qAsConst(extensionList))