diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-02-20 16:54:35 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-03-18 11:00:31 +0100 |
| commit | c5b48c735e1c26444e53c4ea7dc6df4c57b5e9b4 (patch) | |
| tree | 42ee42ccf75a6a5ed24b303fd70d37af157dc905 /tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp | |
| parent | 36fb7cf832e801a7b3718fa443ec2f1b83e0fea2 (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/qqmlecmascript/tst_qqmlecmascript.cpp')
| -rw-r--r-- | tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp | 6 |
1 files changed, 3 insertions, 3 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(); |