diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-09-09 04:13:32 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-09-09 04:13:32 (GMT) |
| commit | 5ad67ddc40263cabd3fd99fb57c8f095403bcbbe (patch) | |
| tree | a06b3640b8e3d6fe431acba0ba42a27ffbae0d87 /src/declarative/util | |
| parent | 14e787b7e5abc1d665ba0e0229f60525283b1e38 (diff) | |
| parent | a57af1d6856ffa3a50eb1e0cdd1653b7b4ebdb41 (diff) | |
| download | Qt-5ad67ddc40263cabd3fd99fb57c8f095403bcbbe.zip Qt-5ad67ddc40263cabd3fd99fb57c8f095403bcbbe.tar.gz Qt-5ad67ddc40263cabd3fd99fb57c8f095403bcbbe.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/util')
| -rw-r--r-- | src/declarative/util/qmlanimation.cpp | 3 | ||||
| -rw-r--r-- | src/declarative/util/qmllistmodel.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp index 6047d4a..3edbc5f 100644 --- a/src/declarative/util/qmlanimation.cpp +++ b/src/declarative/util/qmlanimation.cpp @@ -1442,8 +1442,7 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,ParallelAnimation,QmlParallelAni void QmlPropertyAnimationPrivate::convertVariant(QVariant &variant, int type) { if (variant.type() != QVariant::String) { - if ((uint)type < QVariant::UserType) - variant.convert((QVariant::Type)type); + variant.convert((QVariant::Type)type); return; } diff --git a/src/declarative/util/qmllistmodel.cpp b/src/declarative/util/qmllistmodel.cpp index dc6b02b..82942f6 100644 --- a/src/declarative/util/qmllistmodel.cpp +++ b/src/declarative/util/qmllistmodel.cpp @@ -446,7 +446,7 @@ void QmlListModel::remove(int index) { if (_root) { ModelNode *node = qvariant_cast<ModelNode *>(_root->values.at(index)); - _root->values.remove(index); + _root->values.removeAt(index); if (node) delete node; emit itemsRemoved(index,1); |