diff options
Diffstat (limited to 'src/quick/util')
| -rw-r--r-- | src/quick/util/qquickanimation.cpp | 4 | ||||
| -rw-r--r-- | src/quick/util/qquickconnections.cpp | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp index 77d4809ac6..4544df23fa 100644 --- a/src/quick/util/qquickanimation.cpp +++ b/src/quick/util/qquickanimation.cpp @@ -1601,10 +1601,8 @@ QQuickAnimationGroup::QQuickAnimationGroup(QQuickAnimationGroupPrivate &dd, QObj void QQuickAnimationGroupPrivate::append_animation(QQmlListProperty<QQuickAbstractAnimation> *list, QQuickAbstractAnimation *a) { - QQuickAnimationGroup *q = qobject_cast<QQuickAnimationGroup *>(list->object); - if (q) { + if (QQuickAnimationGroup *q = qmlobject_cast<QQuickAnimationGroup *>(list->object)) a->setGroup(q); - } } void QQuickAnimationGroupPrivate::clear_animation(QQmlListProperty<QQuickAbstractAnimation> *list) diff --git a/src/quick/util/qquickconnections.cpp b/src/quick/util/qquickconnections.cpp index d3c33611e2..934c59bc0f 100644 --- a/src/quick/util/qquickconnections.cpp +++ b/src/quick/util/qquickconnections.cpp @@ -279,7 +279,7 @@ void QQuickConnections::connectSignals() QQmlProperty prop(target(), propName); if (prop.isValid() && (prop.type() & QQmlProperty::SignalProperty)) { QQmlBoundSignal *signal = - new QQmlBoundSignal(target(), prop.method(), this, qmlEngine(this)); + new QQmlBoundSignal(target(), prop.index(), this, qmlEngine(this)); QString location; QQmlContextData *ctxtdata = 0; |