summaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-04-28 01:00:07 +0200
committerUlf Hermann <ulf.hermann@qt.io>2019-04-29 09:12:31 +0200
commit23f988fe48f3f3c63e8311c31ed09394702089d2 (patch)
treefeba876785ad8c7404b44bc3e6e12e0837cf902c /tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
parent3ef2b2727df42510512669ec879788d41d83cebb (diff)
parent332e514fb4954fde9af03e1699c066cbbdb0420d (diff)
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts: src/qml/compiler/qv4compilercontext.cpp src/qml/qml/qqmlmetatype.cpp Change-Id: I02e0216961b92ff68a3f91a70edc33fe9e8db147
Diffstat (limited to 'tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp')
-rw-r--r--tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp15
1 files changed, 15 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index 1b4ff71beb..b97c75e2ce 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -301,6 +301,8 @@ private slots:
void polymorphicFunctionLookup();
void anchorsToParentInPropertyChanges();
+ void typeWrapperToVariant();
+
private:
QQmlEngine engine;
QStringList defaultImportPathList;
@@ -5087,6 +5089,19 @@ void tst_qqmllanguage::anchorsToParentInPropertyChanges()
QTRY_COMPARE(o->property("edgeWidth").toInt(), 200);
}
+void tst_qqmllanguage::typeWrapperToVariant()
+{
+ QQmlEngine engine;
+ QQmlComponent component(&engine, testFileUrl("typeWrapperToVariant.qml"));
+ VERIFY_ERRORS(0);
+ QScopedPointer<QObject> o(component.create());
+ QVERIFY(!o.isNull());
+ QObject *connections = qvariant_cast<QObject *>(o->property("connections"));
+ QVERIFY(connections);
+ QObject *target = qvariant_cast<QObject *>(connections->property("target"));
+ QVERIFY(target);
+}
+
QTEST_MAIN(tst_qqmllanguage)
#include "tst_qqmllanguage.moc"