aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp')
-rw-r--r--tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp24
1 files changed, 18 insertions, 6 deletions
diff --git a/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp b/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp
index 55b776c6a2..4cbb7aaf47 100644
--- a/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp
+++ b/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp
@@ -1,5 +1,5 @@
// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <qtest.h>
#include <QObject>
@@ -60,7 +60,7 @@ namespace {
{
QStringList rv;
- foreach (const QQmlDirParser::Plugin &p, plugins)
+ for (const QQmlDirParser::Plugin &p : plugins)
rv.append(toString(p));
return rv;
@@ -86,7 +86,8 @@ namespace {
{
QStringList rv;
- foreach (const QQmlDirParser::Component &c, components.values())
+ const auto values = components.values();
+ for (const QQmlDirParser::Component &c : values)
rv.append(toString(c));
std::sort(rv.begin(), rv.end());
@@ -97,7 +98,7 @@ namespace {
{
QStringList rv;
- foreach (const QQmlDirParser::Import &c, components)
+ for (const QQmlDirParser::Import &c : components)
rv.append(toString(c));
std::sort(rv.begin(), rv.end());
@@ -115,7 +116,7 @@ namespace {
{
QStringList rv;
- foreach (const QQmlDirParser::Script &s, scripts)
+ for (const QQmlDirParser::Script &s : scripts)
rv.append(toString(s));
return rv;
@@ -421,6 +422,17 @@ void tst_qqmldirparser::parse_data()
<< QStringList()
<< QStringList()
<< false;
+
+ QTest::newRow("versioned-internal")
+ << "versioned-internal/qmldir"
+ << QString()
+ << QStringList()
+ << QStringList()
+ << QStringList()
+ << QStringList({"InternalType|InternalType.qml|1|0|true"})
+ << QStringList()
+ << QStringList()
+ << false;
}
void tst_qqmldirparser::parse()
@@ -435,7 +447,7 @@ void tst_qqmldirparser::parse()
QFETCH(bool, designerSupported);
QFile f(testFile(file));
- f.open(QIODevice::ReadOnly);
+ QVERIFY(f.open(QIODevice::ReadOnly));
QQmlDirParser p;
p.parse(f.readAll());