summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@nokia.com>2010-09-15 08:55:50 (GMT)
committerThomas Hartmann <Thomas.Hartmann@nokia.com>2010-09-15 08:55:50 (GMT)
commit4303f95b24af971393ba5d42eae616f683abaa04 (patch)
treee80c20352d7976c1bcd112cb935167bf3bd17dd3 /src/declarative/qml
parentdc4a56df2809566b5d6a95126f9b834ea34be3fa (diff)
downloadQt-4303f95b24af971393ba5d42eae616f683abaa04.zip
Qt-4303f95b24af971393ba5d42eae616f683abaa04.tar.gz
Qt-4303f95b24af971393ba5d42eae616f683abaa04.tar.bz2
crashfix for tst_qdeclarativeanimations::badTypes()
We always have to check for 0 before converting a raw pointer into a smart pointer Reviewed-by: Kai Koehne
Diffstat (limited to 'src/declarative/qml')
-rw-r--r--src/declarative/qml/qdeclarativebinding_p.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativebinding_p.h b/src/declarative/qml/qdeclarativebinding_p.h
index f38ed23..941a1b3 100644
--- a/src/declarative/qml/qdeclarativebinding_p.h
+++ b/src/declarative/qml/qdeclarativebinding_p.h
@@ -88,13 +88,14 @@ public:
void addToObject(QObject *);
void removeFromObject();
- Pointer weakPointer();
+ static Pointer getPointer(QDeclarativeAbstractBinding *p) { return p ? p->weakPointer() : Pointer(); }
protected:
virtual ~QDeclarativeAbstractBinding();
void clear();
private:
+ Pointer weakPointer();
friend class QDeclarativeData;
friend class QDeclarativeValueTypeProxyBinding;