From 00b9679135be8d83556a31ebe0b3d39d201e76c5 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Tue, 21 Jul 2009 09:18:51 +1000 Subject: Fix crash. --- src/declarative/fx/qfxvisualitemmodel.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/declarative/fx/qfxvisualitemmodel.cpp b/src/declarative/fx/qfxvisualitemmodel.cpp index 1b15a48..3d336c5 100644 --- a/src/declarative/fx/qfxvisualitemmodel.cpp +++ b/src/declarative/fx/qfxvisualitemmodel.cpp @@ -51,6 +51,7 @@ #include "qmlopenmetaobject.h" #include "qmllistaccessor.h" #include "qfxvisualitemmodel.h" +#include "private/qguard_p.h" #include QML_DECLARE_TYPE(QListModelInterface) @@ -64,9 +65,9 @@ class QFxVisualItemModelPrivate : public QObjectPrivate public: QFxVisualItemModelPrivate(QmlContext *); - QListModelInterface *m_listModelInterface; - QAbstractItemModel *m_abstractItemModel; - QFxVisualItemModel *m_visualItemModel; + QGuard m_listModelInterface; + QGuard m_abstractItemModel; + QGuard m_visualItemModel; QString m_part; QmlComponent *m_delegate; -- cgit v0.12 From eac07b9c2bc429d475ac5e95c0fbbae2f603516c Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Tue, 21 Jul 2009 09:19:10 +1000 Subject: Doc clarification. --- src/declarative/util/qmlfollow.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/declarative/util/qmlfollow.cpp b/src/declarative/util/qmlfollow.cpp index 1e6fea2..63b6307 100644 --- a/src/declarative/util/qmlfollow.cpp +++ b/src/declarative/util/qmlfollow.cpp @@ -345,8 +345,7 @@ void QmlFollow::setDamping(qreal damping) to 0 to be considered equal to zero. This will depend on the usage of the value. For pixel positions, 0.25 would suffice. For scale, 0.005 will suffice. - The default is 0.01. Small performance improvements can result in tuning this - value. + The default is 0.01. Tuning this value can provide small performance improvements. */ qreal QmlFollow::epsilon() const { -- cgit v0.12