diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-10-30 05:24:51 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-10-30 05:24:51 (GMT) |
| commit | 46eec6d54bad7a686b3dd5cd6e4aa8577d38740d (patch) | |
| tree | e4c828d1d1456b3fafe74a339562263b3f2c156d /tests/auto/declarative/qmllanguage | |
| parent | d85d7addc5084ee7d5de31dec562437f9c31c35d (diff) | |
| parent | d788c0127b86d8245aa0a8e2472562f444d98ee9 (diff) | |
| download | Qt-46eec6d54bad7a686b3dd5cd6e4aa8577d38740d.zip Qt-46eec6d54bad7a686b3dd5cd6e4aa8577d38740d.tar.gz Qt-46eec6d54bad7a686b3dd5cd6e4aa8577d38740d.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qmlcomponentjs.cpp
src/declarative/qml/qmlcomponentjs_p.h
src/declarative/qml/qmlcomponentjs_p_p.h
Diffstat (limited to 'tests/auto/declarative/qmllanguage')
| -rw-r--r-- | tests/auto/declarative/qmllanguage/testtypes.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/declarative/qmllanguage/testtypes.h b/tests/auto/declarative/qmllanguage/testtypes.h index ace86f0..91c6e2e 100644 --- a/tests/auto/declarative/qmllanguage/testtypes.h +++ b/tests/auto/declarative/qmllanguage/testtypes.h @@ -151,6 +151,7 @@ private: MyQmlObject *m_qmlobject; MyCustomVariantType m_custom; }; +QML_DECLARE_TYPEINFO(MyQmlObject, QML_HAS_ATTACHED_PROPERTIES) QML_DECLARE_TYPE(MyQmlObject); class MyGroupedObject : public QObject |