Also support partly specified versions in JS .imports

Task-number: QTBUG-71278
Change-Id: Ie3167d44780a192b5010052eea5192eee8c21c32
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

2 files changed, 8 insertions, 17 deletions

diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
index a136235f90..b63867ec3d 100644
--- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
+++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
@@ -4514,9 +4514,9 @@ void tst_qqmlecmascript::importScripts_data()
 
     QTest::newRow("missing module version")
             << testFileUrl("jsimportfail/missingModuleVersion.qml")
-            << false /* compilation should succeed */
+            << true /* compilation should succeed */
             << QString()
-            << (QStringList() << testFileUrl("jsimportfail/missingModuleVersion.js").toString() + QLatin1String(":1:17: Module import requires a version"))
+            << QStringList()
             << QStringList()
             << QVariantList();
 
@@ -4524,7 +4524,7 @@ void tst_qqmlecmascript::importScripts_data()
             << testFileUrl("jsimportfail/malformedModuleVersion.qml")
             << false /* compilation should succeed */
             << QString()
-            << (QStringList() << testFileUrl("jsimportfail/malformedModuleVersion.js").toString() + QLatin1String(":1:17: Module import requires a version"))
+            << (QStringList() << testFileUrl("jsimportfail/malformedModuleVersion.js").toString() + QLatin1String(":1:17: Module import requires a qualifier"))
             << QStringList()
             << QVariantList();
 
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());
     }
 }