diff options
| author | Gunnar Sletta <gunnar.sletta@jollamobile.com> | 2014-05-30 15:45:27 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@jollamobile.com> | 2014-08-08 19:51:10 +0200 |
| commit | ca43c4121dde6c8f5d4eabfcf128ff6214996d54 (patch) | |
| tree | 4e3b18116a1d22ad86976b7ef5fe3ceb9d50e7eb /src/qml/types/qqmltimer_p.h | |
| parent | 60ed6a433a1d51d5ca7ccdeff3fce55e2350d20c (diff) | |
Do not emit Timer.onTriggered while executing arbitrary JS code
Task-number: QTBUG-39371
Change-Id: Ibf232560918d30961bd979e14aac3ae7d2f264eb
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
Diffstat (limited to 'src/qml/types/qqmltimer_p.h')
| -rw-r--r-- | src/qml/types/qqmltimer_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/types/qqmltimer_p.h b/src/qml/types/qqmltimer_p.h index c625522851..b51bb7f480 100644 --- a/src/qml/types/qqmltimer_p.h +++ b/src/qml/types/qqmltimer_p.h @@ -81,6 +81,8 @@ protected: void classBegin(); void componentComplete(); + bool event(QEvent *); + public Q_SLOTS: void start(); void stop(); |