diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-04-30 05:32:43 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-04-30 05:32:43 (GMT) |
| commit | 85db980578cb9f1b95be160a4386d9822c6ec6d0 (patch) | |
| tree | 94db73d854dd559a355207f21aa49c903bcce28a /tests/auto/declarative/qdeclarativelanguage | |
| parent | 77cddec6ea642b073d1d9c017c865e740c0c60bc (diff) | |
| download | Qt-85db980578cb9f1b95be160a4386d9822c6ec6d0.zip Qt-85db980578cb9f1b95be160a4386d9822c6ec6d0.tar.gz Qt-85db980578cb9f1b95be160a4386d9822c6ec6d0.tar.bz2 | |
Make QDeclarativeParserStatus method pure virtual to encourage right code.
Fix all code to be right, except multimedia. Currently, it's not *required*
that types work without componentComplete, so not vital.
Diffstat (limited to 'tests/auto/declarative/qdeclarativelanguage')
| -rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/testtypes.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/testtypes.h b/tests/auto/declarative/qdeclarativelanguage/testtypes.h index 89f99c8..acbe219 100644 --- a/tests/auto/declarative/qdeclarativelanguage/testtypes.h +++ b/tests/auto/declarative/qdeclarativelanguage/testtypes.h @@ -99,7 +99,7 @@ private: int m_value2; }; -class MyQmlObject : public QObject, public MyInterface, public QDeclarativeParserStatus +class MyQmlObject : public QObject, public MyInterface { Q_OBJECT Q_PROPERTY(int value READ value WRITE setValue FINAL) @@ -113,7 +113,7 @@ class MyQmlObject : public QObject, public MyInterface, public QDeclarativeParse Q_PROPERTY(MyQmlObject *qmlobjectProperty READ qmlobject WRITE setQmlobject) Q_PROPERTY(int propertyWithNotify READ propertyWithNotify WRITE setPropertyWithNotify NOTIFY oddlyNamedNotifySignal) - Q_INTERFACES(MyInterface QDeclarativeParserStatus) + Q_INTERFACES(MyInterface) public: MyQmlObject() : m_value(-1), m_interface(0), m_qmlobject(0) { qRegisterMetaType<MyCustomVariantType>("MyCustomVariantType"); } |