diff options
| author | Peter Yard <peter.yard@nokia.com> | 2010-04-27 00:39:42 (GMT) |
|---|---|---|
| committer | Peter Yard <peter.yard@nokia.com> | 2010-04-27 00:39:42 (GMT) |
| commit | 88b2bf18c558d0e2f8a9268802f277212f17e61e (patch) | |
| tree | d41ca52003037fba9b45605aa6d2ed86f73b940a /src/declarative/util/qdeclarativetimer_p.h | |
| parent | 4f3a7b5992b5aed67cced46d5d8c8c2f052dfb66 (diff) | |
| parent | 09293f1d07b019dc7bfe95afb93364cc87774e82 (diff) | |
| download | Qt-88b2bf18c558d0e2f8a9268802f277212f17e61e.zip Qt-88b2bf18c558d0e2f8a9268802f277212f17e61e.tar.gz Qt-88b2bf18c558d0e2f8a9268802f277212f17e61e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/declarative/util/qdeclarativetimer_p.h')
| -rw-r--r-- | src/declarative/util/qdeclarativetimer_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/util/qdeclarativetimer_p.h b/src/declarative/util/qdeclarativetimer_p.h index d1e6630..08c3d4e 100644 --- a/src/declarative/util/qdeclarativetimer_p.h +++ b/src/declarative/util/qdeclarativetimer_p.h @@ -63,6 +63,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeTimer : public QObject, public QDeclarati Q_PROPERTY(bool running READ isRunning WRITE setRunning NOTIFY runningChanged) Q_PROPERTY(bool repeat READ isRepeating WRITE setRepeating NOTIFY repeatChanged) Q_PROPERTY(bool triggeredOnStart READ triggeredOnStart WRITE setTriggeredOnStart NOTIFY triggeredOnStartChanged) + Q_PROPERTY(QObject *parent READ parent CONSTANT) public: QDeclarativeTimer(QObject *parent=0); |