diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2023-08-15 10:10:46 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2023-08-15 14:13:32 +0200 |
| commit | 759b8383d7eebd32d946343bc5af53cc748d4e14 (patch) | |
| tree | dbfd99f89ab12e3cbf8af0ef71c49a51df25d432 /tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp | |
| parent | 3cfdac28ca7fb65e10e20c632b240d7c07671d41 (diff) | |
tst_qmlcppcodegen.cpp: Restore ordering of functions
We want them alphabetically sorted so that we minimize merge conflicts.
Change-Id: If6509fb1d196a10898fd6d9a5f51a9da678ad3c9
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp')
| -rw-r--r-- | tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp b/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp index 273571d225..f7f2182796 100644 --- a/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp +++ b/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp @@ -31,6 +31,7 @@ class tst_QmlCppCodegen : public QObject private slots: void initTestCase(); void cleanupTestCase(); + void accessModelMethodFromOutSide(); void aliasLookup(); void ambiguousAs(); @@ -78,6 +79,7 @@ private slots: void enumsInOtherObject(); void equalityQObjects(); void equalityQUrl(); + void equalityTestsWithNullOrUndefined(); void equalityVarAndNonStorable(); void equalsUndefined(); void evadingAmbiguity(); @@ -203,7 +205,6 @@ private slots: void variantReturn(); void variantlist(); void voidFunction(); - void equalityTestsWithNullOrUndefined(); }; static QByteArray arg1() @@ -1466,6 +1467,15 @@ void tst_QmlCppCodegen::equalityQUrl() QVERIFY(object->property("sourceIsNotEmptyWeak").toBool()); } +void tst_QmlCppCodegen::equalityTestsWithNullOrUndefined() +{ + QQmlEngine engine; + QQmlComponent component(&engine, QUrl(u"qrc:/qt/qml/TestTypes/equalityTestsWithNullOrUndefined.qml"_s)); + QVERIFY2(component.isReady(), component.errorString().toUtf8()); + QScopedPointer<QObject> o(component.create()); + QVERIFY(o); +} + void tst_QmlCppCodegen::equalityVarAndNonStorable() { QQmlEngine engine; @@ -4110,15 +4120,6 @@ void tst_QmlCppCodegen::voidFunction() QCOMPARE(object->objectName(), u"barbar"_s); } -void tst_QmlCppCodegen::equalityTestsWithNullOrUndefined() -{ - QQmlEngine engine; - QQmlComponent component(&engine, QUrl(u"qrc:/qt/qml/TestTypes/equalityTestsWithNullOrUndefined.qml"_s)); - QVERIFY2(component.isReady(), component.errorString().toUtf8()); - QScopedPointer<QObject> o(component.create()); - QVERIFY(o); -} - QTEST_MAIN(tst_QmlCppCodegen) #include "tst_qmlcppcodegen.moc" |