aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmlparser
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2020-02-20 16:54:35 +0100
committerUlf Hermann <ulf.hermann@qt.io>2020-03-18 11:00:31 +0100
commitc5b48c735e1c26444e53c4ea7dc6df4c57b5e9b4 (patch)
tree42ee42ccf75a6a5ed24b303fd70d37af157dc905 /tests/auto/qml/qqmlparser
parent36fb7cf832e801a7b3718fa443ec2f1b83e0fea2 (diff)
Also support partly specified versions in JS .imports
Task-number: QTBUG-71278 Change-Id: Ie3167d44780a192b5010052eea5192eee8c21c32 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tests/auto/qml/qqmlparser')
-rw-r--r--tests/auto/qml/qqmlparser/tst_qqmlparser.cpp19
1 files changed, 5 insertions, 14 deletions
diff --git a/tests/auto/qml/qqmlparser/tst_qqmlparser.cpp b/tests/auto/qml/qqmlparser/tst_qqmlparser.cpp
index 8483bd1f95..e4bcfa7796 100644
--- a/tests/auto/qml/qqmlparser/tst_qqmlparser.cpp
+++ b/tests/auto/qml/qqmlparser/tst_qqmlparser.cpp
@@ -59,7 +59,7 @@ private slots:
void templateLiteral();
void leadingSemicolonInClass();
void templatedReadonlyProperty();
- void qmlImportInJSRequiresFullVersion();
+ void qmlImportInJS();
void typeAnnotations_data();
void typeAnnotations();
void disallowedTypeAnnotations_data();
@@ -361,37 +361,28 @@ void tst_qqmlparser::templatedReadonlyProperty()
QVERIFY(parser.parse());
}
-void tst_qqmlparser::qmlImportInJSRequiresFullVersion()
+void tst_qqmlparser::qmlImportInJS()
{
{
QQmlJS::Engine engine;
QQmlJS::Lexer lexer(&engine);
lexer.setCode(QLatin1String(".import Test 1.0 as T"), 0, false);
QQmlJS::Parser parser(&engine);
- bool b = parser.parseProgram();
- qDebug() << parser.errorMessage();
- QVERIFY(b);
+ QVERIFY(parser.parseProgram());
}
{
QQmlJS::Engine engine;
QQmlJS::Lexer lexer(&engine);
lexer.setCode(QLatin1String(".import Test 1 as T"), 0, false);
QQmlJS::Parser parser(&engine);
- QVERIFY(!parser.parseProgram());
- }
- {
- QQmlJS::Engine engine;
- QQmlJS::Lexer lexer(&engine);
- lexer.setCode(QLatin1String(".import Test 1 as T"), 0, false);
- QQmlJS::Parser parser(&engine);
- QVERIFY(!parser.parseProgram());
+ QVERIFY(parser.parseProgram());
}
{
QQmlJS::Engine engine;
QQmlJS::Lexer lexer(&engine);
lexer.setCode(QLatin1String(".import Test as T"), 0, false);
QQmlJS::Parser parser(&engine);
- QVERIFY(!parser.parseProgram());
+ QVERIFY(parser.parseProgram());
}
}