From e3b1106afae5de6cd54ce627a0b11be041624591 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 24 Jul 2019 13:43:54 +0200 Subject: Compile fix with recent Qt dev The reasoning in 1b4766e26c6b did not take into account that the scope of QT_NO_JAVA_STYLE_ITERATORS may change over time, as done with f70905448f6 in Qt base. Change-Id: Ib1966ff26c4d36d5f62e149d6b45baa4aecf825d Reviewed-by: Eike Ziller --- src/plugins/cpptools/cppmodelmanager_test.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/plugins/cpptools/cppmodelmanager_test.cpp') diff --git a/src/plugins/cpptools/cppmodelmanager_test.cpp b/src/plugins/cpptools/cppmodelmanager_test.cpp index be6791738b..f84a3f176c 100644 --- a/src/plugins/cpptools/cppmodelmanager_test.cpp +++ b/src/plugins/cpptools/cppmodelmanager_test.cpp @@ -618,11 +618,10 @@ void CppToolsPlugin::test_modelmanager_extraeditorsupport_uiFiles() QCOMPARE(workingCopy.size(), 2); // mm->configurationFileName() and "ui_*.h" QStringList fileNamesInWorkinCopy; - QHashIterator > it = workingCopy.iterator(); - while (it.hasNext()) { - it.next(); + const WorkingCopy::Table &elements = workingCopy.elements(); + for (auto it = elements.cbegin(), end = elements.cend(); it != end; ++it) fileNamesInWorkinCopy << Utils::FilePath::fromString(it.key().toString()).fileName(); - } + fileNamesInWorkinCopy.sort(); const QString expectedUiHeaderFileName = _("ui_mainwindow.h"); QCOMPARE(fileNamesInWorkinCopy.at(0), mm->configurationFileName()); -- cgit v1.2.1