diff options
author | Fabian Kosmale <fabian.kosmale@qt.io> | 2019-10-04 09:28:14 +0200 |
---|---|---|
committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2019-10-07 07:51:25 +0200 |
commit | 036cd790878eef614b063c619ca148a325cb4e67 (patch) | |
tree | 15198f6690390a35e24236405dbe3735133171e7 /tests/auto/qml/qqmlvaluetypeproviders | |
parent | fb8ef71079b53b3ed74be229047639fe67a50279 (diff) |
Modernize tst_qqmlvaluetypeproviders.cpp
Use QML_NAMED_ELEMENT macro
Replace setContextProperty with required property + createWithInitialProperties
Change-Id: I435f370c85be9c4592ec3a76cc3a8aa11f7f0ee2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/qml/qqmlvaluetypeproviders')
-rw-r--r-- | tests/auto/qml/qqmlvaluetypeproviders/data/userType.qml | 1 | ||||
-rw-r--r-- | tests/auto/qml/qqmlvaluetypeproviders/tst_qqmlvaluetypeproviders.cpp | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/auto/qml/qqmlvaluetypeproviders/data/userType.qml b/tests/auto/qml/qqmlvaluetypeproviders/data/userType.qml index d2f748c4c4..2aa03ed39f 100644 --- a/tests/auto/qml/qqmlvaluetypeproviders/data/userType.qml +++ b/tests/auto/qml/qqmlvaluetypeproviders/data/userType.qml @@ -2,6 +2,7 @@ import QtQuick 2.0 import Test 1.0 Item { + required property TestValueExporter testValueExporter property bool success: false // Test user value type stored as both var and variant diff --git a/tests/auto/qml/qqmlvaluetypeproviders/tst_qqmlvaluetypeproviders.cpp b/tests/auto/qml/qqmlvaluetypeproviders/tst_qqmlvaluetypeproviders.cpp index 22074602b7..b44889798c 100644 --- a/tests/auto/qml/qqmlvaluetypeproviders/tst_qqmlvaluetypeproviders.cpp +++ b/tests/auto/qml/qqmlvaluetypeproviders/tst_qqmlvaluetypeproviders.cpp @@ -256,6 +256,7 @@ class TestValueExporter : public QObject { Q_OBJECT Q_PROPERTY(TestValue testValue READ testValue WRITE setTestValue) + QML_NAMED_ELEMENT(TestValueExporter) public: TestValue testValue() const { return m_testValue; } void setTestValue(const TestValue &v) { m_testValue = v; } @@ -275,15 +276,14 @@ void tst_qqmlvaluetypeproviders::userType() qRegisterMetaType<TestValue>(); QMetaType::registerComparators<TestValue>(); - qmlRegisterType<TestValueExporter>("Test", 1, 0, "TestValueExporter"); + qmlRegisterTypesAndRevisions<TestValueExporter>("Test", 1); TestValueExporter exporter; QQmlEngine e; - e.rootContext()->setContextProperty("testValueExporter", &exporter); QQmlComponent component(&e, testFileUrl("userType.qml")); - QScopedPointer<QObject> obj(component.create()); + QScopedPointer<QObject> obj(component.createWithInitialProperties({{"testValueExporter", QVariant::fromValue(&exporter)}})); QVERIFY(obj != nullptr); QCOMPARE(obj->property("success").toBool(), true); } |