From 85c2e491bee23c274ad2b4d67ab065c2a91893b5 Mon Sep 17 00:00:00 2001 From: Warwick Allison Date: Wed, 5 Aug 2009 11:36:57 +1000 Subject: Fix imports. Still a FAIL. --- tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp b/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp index e35a006..65d061e 100644 --- a/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp +++ b/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp @@ -12,7 +12,7 @@ public: }; QML_DECLARE_TYPE(MyQmlObject); -QML_DEFINE_TYPE(MyQmlObject,MyQmlObject); +QML_DEFINE_TYPE(Test,1,0,0,MyQmlObject,MyQmlObject); class MyContainer : public QObject { @@ -31,7 +31,7 @@ private: }; QML_DECLARE_TYPE(MyContainer); -QML_DEFINE_TYPE(MyContainer,MyContainer); +QML_DEFINE_TYPE(Test,1,0,0,MyContainer,MyContainer); class tst_QmlMetaProperty : public QObject { @@ -52,7 +52,7 @@ private: void tst_QmlMetaProperty::writeObjectToList() { - QmlComponent containerComponent(&engine, "MyContainer { children: MyQmlObject {} }"); + QmlComponent containerComponent(&engine, "import Test 1.0\nMyContainer { children: MyQmlObject {} }", QUrl()); MyContainer *container = qobject_cast(containerComponent.create()); QVERIFY(container != 0); QVERIFY(container->children()->size() == 1); @@ -67,7 +67,7 @@ void tst_QmlMetaProperty::writeObjectToList() Q_DECLARE_METATYPE(QList); void tst_QmlMetaProperty::writeListToList() { - QmlComponent containerComponent(&engine, "MyContainer { children: MyQmlObject {} }"); + QmlComponent containerComponent(&engine, "import Test 1.0\nMyContainer { children: MyQmlObject {} }", QUrl()); MyContainer *container = qobject_cast(containerComponent.create()); QVERIFY(container != 0); QVERIFY(container->children()->size() == 1); @@ -87,7 +87,7 @@ void tst_QmlMetaProperty::writeListToList() void tst_QmlMetaProperty::writeObjectToQmlList() { - QmlComponent containerComponent(&engine, "MyContainer { qmlChildren: MyQmlObject {} }"); + QmlComponent containerComponent(&engine, "import Test 1.0\nMyContainer { qmlChildren: MyQmlObject {} }", QUrl()); MyContainer *container = qobject_cast(containerComponent.create()); QVERIFY(container != 0); QVERIFY(container->qmlChildren()->size() == 1); -- cgit v0.12