diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-03-02 00:53:46 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-03-02 00:53:46 (GMT) |
| commit | adc06e50e1ebb65e9facc58ad01aaa8e879efe6e (patch) | |
| tree | d359d608c85759c8385192e5540fe5ae3d73a1c2 /tools | |
| parent | 21c15c9efb1b34df6b990c69479979a336267d1b (diff) | |
| parent | b88740e48ce82bc118a598358a8d8aff79d2a279 (diff) | |
| download | Qt-adc06e50e1ebb65e9facc58ad01aaa8e879efe6e.zip Qt-adc06e50e1ebb65e9facc58ad01aaa8e879efe6e.tar.gz Qt-adc06e50e1ebb65e9facc58ad01aaa8e879efe6e.tar.bz2 | |
Merge branch 'master' into 4.7
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qml/qfxtester.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qml/qfxtester.h b/tools/qml/qfxtester.h index 1a9f077..6521409 100644 --- a/tools/qml/qfxtester.h +++ b/tools/qml/qfxtester.h @@ -54,12 +54,12 @@ QT_BEGIN_NAMESPACE class QDeclarativeVisualTest : public QObject { Q_OBJECT - Q_PROPERTY(QList<QObject *>* events READ events CONSTANT) + Q_PROPERTY(QDeclarativeListProperty<QObject> events READ events CONSTANT) Q_CLASSINFO("DefaultProperty", "events") public: QDeclarativeVisualTest() {} - QList<QObject *> *events() { return &m_events; } + QDeclarativeListProperty<QObject> events() { return QDeclarativeListProperty<QObject>(this, m_events); } int count() const { return m_events.count(); } QObject *event(int idx) { return m_events.at(idx); } |