diff options
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/animations/qparallelanimationgroupjob.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativevmemetaobject.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/declarative/animations/qparallelanimationgroupjob.cpp b/src/declarative/animations/qparallelanimationgroupjob.cpp index 9411ad862c..5a417dccf4 100644 --- a/src/declarative/animations/qparallelanimationgroupjob.cpp +++ b/src/declarative/animations/qparallelanimationgroupjob.cpp @@ -200,7 +200,7 @@ void QParallelAnimationGroupJob::updateDirection(QAbstractAnimationJob::Directio void QParallelAnimationGroupJob::uncontrolledAnimationFinished(QAbstractAnimationJob *animation) { - Q_ASSERT(animation && animation->duration() == -1 || animation->loopCount() < 0); + Q_ASSERT(animation && (animation->duration() == -1 || animation->loopCount() < 0)); int uncontrolledRunningCount = 0; for (QAbstractAnimationJob *child = firstChild(); child; child = child->nextSibling()) { diff --git a/src/declarative/qml/qdeclarativevmemetaobject.cpp b/src/declarative/qml/qdeclarativevmemetaobject.cpp index 18b29f3411..36a8838c75 100644 --- a/src/declarative/qml/qdeclarativevmemetaobject.cpp +++ b/src/declarative/qml/qdeclarativevmemetaobject.cpp @@ -736,7 +736,8 @@ int QDeclarativeVMEMetaObject::metaCall(QMetaObject::Call c, int _id, void **a) // are not rewritten correctly but this bug is deemed out-of-scope to fix for // performance reasons; see QTBUG-24064) and thus compilation will have failed. QDeclarativeError e; - e.setDescription(QString(QLatin1String("Exception occurred during compilation of function: %1")).arg(QMetaObject::method(_id).signature())); + e.setDescription(QString(QLatin1String("Exception occurred during compilation of function: %1")). + arg(QLatin1String(QMetaObject::method(_id).signature()))); ep->warning(e); return -1; // The dynamic method with that id is not available. } |