diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2009-11-05 03:57:09 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2009-11-05 03:57:09 (GMT) |
| commit | d39ec85b7e5d8702c2888cdad4ccdae72531c199 (patch) | |
| tree | f38aa46e3c0d9c6432d9175d1511f1ac0d4de940 /tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp | |
| parent | 43163cec2bcf9012944b445b393f6f8a6e895138 (diff) | |
| parent | deca6c1c9885554e4e51ebd6dafdd78a424904e4 (diff) | |
| download | Qt-d39ec85b7e5d8702c2888cdad4ccdae72531c199.zip Qt-d39ec85b7e5d8702c2888cdad4ccdae72531c199.tar.gz Qt-d39ec85b7e5d8702c2888cdad4ccdae72531c199.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp')
| -rw-r--r-- | tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp b/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp index 7fbffdb..d6e88b5 100644 --- a/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp +++ b/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp @@ -54,7 +54,7 @@ public: }; QML_DECLARE_TYPE(MyQmlObject); -QML_DEFINE_TYPE(Test,1,0,0,MyQmlObject,MyQmlObject); +QML_DEFINE_TYPE(Test,1,0,MyQmlObject,MyQmlObject); class MyContainer : public QObject { @@ -73,7 +73,7 @@ private: }; QML_DECLARE_TYPE(MyContainer); -QML_DEFINE_TYPE(Test,1,0,0,MyContainer,MyContainer); +QML_DEFINE_TYPE(Test,1,0,MyContainer,MyContainer); class tst_qmlmetaproperty : public QObject { |