aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/propertyrequirements/tst_propertyrequirements.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/quick/propertyrequirements/tst_propertyrequirements.cpp')
-rw-r--r--tests/auto/quick/propertyrequirements/tst_propertyrequirements.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/quick/propertyrequirements/tst_propertyrequirements.cpp b/tests/auto/quick/propertyrequirements/tst_propertyrequirements.cpp
index 34be4d98b4..ca348eea03 100644
--- a/tests/auto/quick/propertyrequirements/tst_propertyrequirements.cpp
+++ b/tests/auto/quick/propertyrequirements/tst_propertyrequirements.cpp
@@ -28,7 +28,6 @@
#include <qtest.h>
#include <QtQml/qqmlcomponent.h>
#include <QtQml/qqmlengine.h>
-#include <QtQml/private/qhashedstring_p.h>
#include <QtQml/private/qqmlmetatype_p.h>
#include <QtCore/QDebug>
#include <QtCore/QHash>
@@ -121,7 +120,7 @@ void tst_PropertyRequirements::constantOrNotifyableFull()
}
static const QString messagePattern("\nProperty %1 neither CONSTANT nor NOTIFYable. Affected types:\n\t%2");
- QStringList occurrencesList = occurrences.toList();
+ QStringList occurrencesList = occurrences.values();
occurrencesList.sort();
messages.append(messagePattern.arg(it.key(), occurrencesList.join("\n\t")));
@@ -159,7 +158,8 @@ void tst_PropertyRequirements::testAllQmlTypes(TestDepth testDepth, FailuresByPr
testQmlType(testDepth, qmlType, failuresByProperty);
}
}
- seenTypes.unite(QSet<QString>::fromList(QQmlMetaType::qmlTypeNames()));
+ const auto &typeNameList = QQmlMetaType::qmlTypeNames();
+ seenTypes.unite(QSet<QString>(typeNameList.cbegin(), typeNameList.cend()));
}
}