diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-07-21 06:40:21 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-07-21 06:40:21 (GMT) |
| commit | 4dc3189aea1c619828abdf87e553587c656ede63 (patch) | |
| tree | 911d5c78a121ea65edb00f4ece1b8ad90c62058a | |
| parent | d2ad09f42db2b6b80427918261f96081eaabfe6c (diff) | |
| parent | eac07b9c2bc429d475ac5e95c0fbbae2f603516c (diff) | |
| download | Qt-4dc3189aea1c619828abdf87e553587c656ede63.zip Qt-4dc3189aea1c619828abdf87e553587c656ede63.tar.gz Qt-4dc3189aea1c619828abdf87e553587c656ede63.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| -rw-r--r-- | src/declarative/fx/qfxvisualitemmodel.cpp | 7 | ||||
| -rw-r--r-- | src/declarative/util/qmlfollow.cpp | 3 |
2 files changed, 5 insertions, 5 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 <QtCore/qdebug.h> 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<QListModelInterface> m_listModelInterface; + QGuard<QAbstractItemModel> m_abstractItemModel; + QGuard<QFxVisualItemModel> m_visualItemModel; QString m_part; QmlComponent *m_delegate; 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 { |