diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2011-08-03 01:11:41 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2011-08-03 01:11:41 (GMT) |
| commit | ed54c64af0d61d6bfea2ec87428ba5d008a30564 (patch) | |
| tree | 32cf82e90870bd43394e490b3f4ee2a3f79eae1b /src/declarative/util | |
| parent | 8ef0e62055a2c98637e0b7423feda3ebca7983f4 (diff) | |
| download | Qt-ed54c64af0d61d6bfea2ec87428ba5d008a30564.zip Qt-ed54c64af0d61d6bfea2ec87428ba5d008a30564.tar.gz Qt-ed54c64af0d61d6bfea2ec87428ba5d008a30564.tar.bz2 | |
Prevent Binding from crashing when its target object is deleted.
Change-Id: Ic83cfcaeccf6639976864bb2f38f5bcff16e2b11
Task-number: QTBUG-20692
Reviewed-by: Martin Jones
Diffstat (limited to 'src/declarative/util')
| -rw-r--r-- | src/declarative/util/qdeclarativebind.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativebind.cpp b/src/declarative/util/qdeclarativebind.cpp index b7199ac..051df60 100644 --- a/src/declarative/util/qdeclarativebind.cpp +++ b/src/declarative/util/qdeclarativebind.cpp @@ -42,6 +42,7 @@ #include "private/qdeclarativebind_p.h" #include "private/qdeclarativenullablevalue_p_p.h" +#include "private/qdeclarativeguard_p.h" #include <qdeclarativeengine.h> #include <qdeclarativecontext.h> @@ -64,7 +65,7 @@ public: bool when : 1; bool componentComplete : 1; - QObject *obj; + QDeclarativeGuard<QObject> obj; QString prop; QDeclarativeNullableValue<QVariant> value; }; |