diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-19 07:09:06 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-19 07:09:06 (GMT) |
| commit | 58bf0fc6b1f1815c4f22762c39c4374fd17beb4e (patch) | |
| tree | a91643a12d62a0474fe203b6d5fe7c2a8fbafe7e /tests/auto/declarative/qdeclarativeecmascript | |
| parent | 4223acff70de3036c5b7d75bccaec0c540c23556 (diff) | |
| parent | 698a39fc699c3f8d6b7e28e10a8e3048fed274bd (diff) | |
| download | Qt-58bf0fc6b1f1815c4f22762c39c4374fd17beb4e.zip Qt-58bf0fc6b1f1815c4f22762c39c4374fd17beb4e.tar.gz Qt-58bf0fc6b1f1815c4f22762c39c4374fd17beb4e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tests/auto/declarative/qdeclarativeecmascript')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeecmascript/testtypes.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/auto/declarative/qdeclarativeecmascript/testtypes.h b/tests/auto/declarative/qdeclarativeecmascript/testtypes.h index 4424419..79d3226 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/testtypes.h +++ b/tests/auto/declarative/qdeclarativeecmascript/testtypes.h @@ -170,7 +170,6 @@ private: }; QML_DECLARE_TYPEINFO(MyQmlObject, QML_HAS_ATTACHED_PROPERTIES) -QML_DECLARE_TYPE(MyQmlObject); class MyQmlContainer : public QObject { @@ -185,7 +184,6 @@ private: QList<MyQmlObject*> m_children; }; -QML_DECLARE_TYPE(MyQmlContainer); class MyExpression : public QDeclarativeExpression { @@ -258,7 +256,6 @@ private: QObject *m_object; QObject *m_object2; }; -QML_DECLARE_TYPE(MyDeferredObject); class MyBaseExtendedObject : public QObject { @@ -273,7 +270,6 @@ public: private: int m_value; }; -QML_DECLARE_TYPE(MyBaseExtendedObject); class MyExtendedObject : public MyBaseExtendedObject { @@ -288,7 +284,6 @@ public: private: int m_value; }; -QML_DECLARE_TYPE(MyExtendedObject); class MyTypeObject : public QObject { @@ -555,7 +550,6 @@ signals: void rectPropertyChanged(); }; Q_DECLARE_OPERATORS_FOR_FLAGS(MyTypeObject::MyFlags) -QML_DECLARE_TYPE(MyTypeObject); Q_DECLARE_METATYPE(QScriptValue); class MyInvokableObject : public QObject |