diff options
| author | Olivier De Cannière <olivier.decanniere@qt.io> | 2023-03-29 16:12:22 +0200 |
|---|---|---|
| committer | Olivier De Cannière <olivier.decanniere@qt.io> | 2023-03-29 19:07:26 +0200 |
| commit | 20d87c626d4f1c67dd495cc3ba5d9124de823b72 (patch) | |
| tree | 4a6621521abd1886d5ae467aefc21bf8f7145466 /tests/auto/qml/qmllint | |
| parent | 5db77fb406bb36a27de1ad2e3390720411c833f9 (diff) | |
TypeResolver: Allow conversions from string to QDate and QTime
The conversion from string to QDateTime is already possible.
Change-Id: I1100065e424e3873c0723ad0359ed6d3d9984b5e
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'tests/auto/qml/qmllint')
4 files changed, 25 insertions, 0 deletions
diff --git a/tests/auto/qml/qmllint/data/StringToDateTime/qmldir b/tests/auto/qml/qmllint/data/StringToDateTime/qmldir new file mode 100644 index 0000000000..761f613496 --- /dev/null +++ b/tests/auto/qml/qmllint/data/StringToDateTime/qmldir @@ -0,0 +1,3 @@ +module StringToDateTime +typeinfo stringToDateTime.qmltypes +import QtQml diff --git a/tests/auto/qml/qmllint/data/StringToDateTime/stringToDateTime.qmltypes b/tests/auto/qml/qmllint/data/StringToDateTime/stringToDateTime.qmltypes new file mode 100644 index 0000000000..e0f13fa2ec --- /dev/null +++ b/tests/auto/qml/qmllint/data/StringToDateTime/stringToDateTime.qmltypes @@ -0,0 +1,14 @@ +import QtQuick.tooling 1.2 +Module { + Component { + file: "stringToQDateTime.h" + name: "StringToDateTimeComponent" + exports: ["QmlLintTestLib/StringToDateTime 1.0"] + exportMetaObjectRevisions: [256] + accessSemantics: "reference" + prototype: "QObject" + Property { name: "aDate"; type: "QDate"; read: "getADate"; write: "setADate" } + Property { name: "aTime"; type: "QTime"; read: "getATime"; write: "setATime" } + Property { name: "aDateTime"; type: "QDateTime"; read: "getADateTime"; write: "setADateTime" } + } +} diff --git a/tests/auto/qml/qmllint/data/stringToDateTime.qml b/tests/auto/qml/qmllint/data/stringToDateTime.qml new file mode 100644 index 0000000000..dc4bd6cda5 --- /dev/null +++ b/tests/auto/qml/qmllint/data/stringToDateTime.qml @@ -0,0 +1,7 @@ +import StringToDateTime + +StringToDateTime { + aDate: "2023-03-29" + aTime: "15:10:41" + aDateTime: "2023-03-29 15:10:41" +} diff --git a/tests/auto/qml/qmllint/tst_qmllint.cpp b/tests/auto/qml/qmllint/tst_qmllint.cpp index 6700646056..c4726e2708 100644 --- a/tests/auto/qml/qmllint/tst_qmllint.cpp +++ b/tests/auto/qml/qmllint/tst_qmllint.cpp @@ -1224,6 +1224,7 @@ void TestQmllint::cleanQmlCode_data() QTest::newRow("onlyMajorVersion") << QStringLiteral("onlyMajorVersion.qml"); QTest::newRow("attachedImportUse") << QStringLiteral("attachedImportUse.qml"); QTest::newRow("VariantMapGetPropertyLookup") << QStringLiteral("variantMapLookup.qml"); + QTest::newRow("StringToDateTime") << QStringLiteral("stringToDateTime.qml"); } void TestQmllint::cleanQmlCode() |