aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmldirparser
diff options
context:
space:
mode:
authorRobin Burchell <robin.burchell@crimson.no>2017-01-24 12:35:13 +0100
committerRobin Burchell <robin.burchell@crimson.no>2017-01-24 17:37:34 +0000
commitb9fe2c2bfd99098ad06154d7fa8c104ac63a1257 (patch)
treec375640842da963f005a3c88605b6f24be48bba5 /tests/auto/qml/qqmldirparser
parentca6b787a01ea289bd5c2a3e4ff3c7442a4ff58fc (diff)
Teach QQmlDirParser to ignore the classname keyword
This saves QQmlImport from some unnecessary bad lookups when finding types (due to classname being misinterpreted as belonging as a component). Change-Id: I36e622e357e55e98a5af46911709640c5d8fa291 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/qml/qqmldirparser')
-rw-r--r--tests/auto/qml/qqmldirparser/data/classname/qmldir5
-rw-r--r--tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp9
2 files changed, 14 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmldirparser/data/classname/qmldir b/tests/auto/qml/qqmldirparser/data/classname/qmldir
new file mode 100644
index 0000000000..8167e813df
--- /dev/null
+++ b/tests/auto/qml/qqmldirparser/data/classname/qmldir
@@ -0,0 +1,5 @@
+module QtQuick
+plugin qtquick2plugin
+classname QtQuick2Plugin
+typeinfo plugins.qmltypes
+designersupported
diff --git a/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp b/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp
index 7d154d0ea6..3643ca65c6 100644
--- a/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp
+++ b/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp
@@ -325,6 +325,15 @@ void tst_qqmldirparser::parse_data()
<< QStringList()
<< (QStringList() << "bar||1|0|true")
<< false;
+
+ QTest::newRow("classname")
+ << "classname/qmldir"
+ << QStringList()
+ << (QStringList() << "qtquick2plugin|")
+ << QStringList()
+ << QStringList()
+ << QStringList()
+ << true;
}
void tst_qqmldirparser::parse()