diff options
author | Lasse Holmstedt <lasse.holmstedt@nokia.com> | 2011-10-26 16:47:51 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-27 02:16:27 +0200 |
commit | 6bdd27780466b60b8b06cc874071281a53b00ee0 (patch) | |
tree | 489b38092588742a120c9fbaab3836766e951caf /src/imports/serviceframework/qdeclarativeservice_p.h | |
parent | 4645820c83db4ef14539a6e9c68be26191504e90 (diff) |
Fix crashes with service framework object when used in QML
If the change signal is not emitted when the qobject is set to 0, there
is no way that v8 will know about the change, and will result in a crash
with an invalid pointer.
Change-Id: Ifb065cd50e0b311917e44ad997c7eeaa0eaf648e
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
Reviewed-by: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com>
Diffstat (limited to 'src/imports/serviceframework/qdeclarativeservice_p.h')
-rw-r--r-- | src/imports/serviceframework/qdeclarativeservice_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/imports/serviceframework/qdeclarativeservice_p.h b/src/imports/serviceframework/qdeclarativeservice_p.h index 2dc827e4..725546e1 100644 --- a/src/imports/serviceframework/qdeclarativeservice_p.h +++ b/src/imports/serviceframework/qdeclarativeservice_p.h @@ -100,6 +100,7 @@ private slots: private: void updateDescriptor(); + void setServiceObject(QObject *object); QPointer<QObject> m_serviceInstance; QServiceManager* m_serviceManager; |