From ac5e8f92d3bb5820e7a4bdc903473d421463922d Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Tue, 29 Sep 2009 12:04:17 +1000 Subject: Fix crash bug when inspecting QmlBoundSignalParameters objects in debugger. --- src/declarative/qml/qmlboundsignal.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/declarative/qml/qmlboundsignal.cpp b/src/declarative/qml/qmlboundsignal.cpp index 08c3387..ce591e8 100644 --- a/src/declarative/qml/qmlboundsignal.cpp +++ b/src/declarative/qml/qmlboundsignal.cpp @@ -243,6 +243,9 @@ void QmlBoundSignalParameters::clearValues() int QmlBoundSignalParameters::metaCall(QMetaObject::Call c, int id, void **a) { + if (!values) + return -1; + if (c == QMetaObject::ReadProperty && id >= 1) { QmlMetaType::copy(types[id - 1], a[0], values[id]); return -1; -- cgit v0.12 From 1767c1dddf1727abb0b6ec629a8f6234f22b218f Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Tue, 29 Sep 2009 15:11:37 +1000 Subject: Use Q_ENUMS for State and Direction enums. --- src/corelib/animation/qabstractanimation.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/corelib/animation/qabstractanimation.h b/src/corelib/animation/qabstractanimation.h index dc0af19..ce4b62f 100644 --- a/src/corelib/animation/qabstractanimation.h +++ b/src/corelib/animation/qabstractanimation.h @@ -59,6 +59,8 @@ class QAbstractAnimationPrivate; class Q_CORE_EXPORT QAbstractAnimation : public QObject { Q_OBJECT + Q_ENUMS(State) + Q_ENUMS(Direction) Q_PROPERTY(State state READ state NOTIFY stateChanged) Q_PROPERTY(int loopCount READ loopCount WRITE setLoopCount) Q_PROPERTY(int currentTime READ currentTime WRITE setCurrentTime) -- cgit v0.12