diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-09-16 13:47:45 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-16 15:08:15 +0200 |
| commit | 5eab92e9a3017067fe3e4c84832661c8213245f4 (patch) | |
| tree | e35021b7ab99d6aff6ed25eec471e812ebd17601 | |
| parent | 07cb1ad4ccb1a11d8f46246b6a1890c267cbb147 (diff) | |
Fix an assertion in QDeclarativeNotifierEndpoint
The code in toNotifier() tried to convert to a
Notifier, and called asNotifier() before setting
the type correctly.
Change-Id: I2d4c41c6bf43422587111ae4e0c57a3905f159e0
Reviewed-on: http://codereview.qt-project.org/5089
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| -rw-r--r-- | src/declarative/qml/qdeclarativenotifier_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativenotifier_p.h b/src/declarative/qml/qdeclarativenotifier_p.h index 6119517940..6974ea2eed 100644 --- a/src/declarative/qml/qdeclarativenotifier_p.h +++ b/src/declarative/qml/qdeclarativenotifier_p.h @@ -230,12 +230,12 @@ QDeclarativeNotifierEndpoint::Notifier *QDeclarativeNotifierEndpoint::toNotifier s->~Signal(); } + type = NotifierType; Notifier *n = asNotifier(); n->next = 0; n->prev = 0; n->disconnected = 0; n->notifier = 0; - type = NotifierType; return n; } |