Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

1 files changed, 12 insertions, 5 deletions

diff --git a/src/corelib/animation/qpropertyanimation.cpp b/src/corelib/animation/qpropertyanimation.cpp
index eec5b30..cfd7cc2 100644
--- a/src/corelib/animation/qpropertyanimation.cpp
+++ b/src/corelib/animation/qpropertyanimation.cpp
@@ -256,7 +256,8 @@ void QPropertyAnimation::updateState(QAbstractAnimation::State newState,
     Q_D(QPropertyAnimation);
 
     if (!d->target && oldState == Stopped) {
-        qWarning("QPropertyAnimation::updateState: Changing state of an animation without target");
+        qWarning("QPropertyAnimation::updateState (%s): Changing state of an animation without target",
+                 d->propertyName.constData());
         return;
     }
 
@@ -279,10 +280,16 @@ void QPropertyAnimation::updateState(QAbstractAnimation::State newState,
             if (oldState == Stopped) {
                 d->setDefaultStartEndValue(d->targetValue->property(d->propertyName.constData()));
                 //let's check if we have a start value and an end value
-                if (!startValue().isValid() && (d->direction == Backward || !d->defaultStartEndValue.isValid()))
-                    qWarning("QPropertyAnimation::updateState: starting an animation without start value");
-                if (!endValue().isValid() && (d->direction == Forward || !d->defaultStartEndValue.isValid()))
-                    qWarning("QPropertyAnimation::updateState: starting an animation without end value");
+                if (!startValue().isValid() && (d->direction == Backward || !d->defaultStartEndValue.isValid())) {
+                    qWarning("QPropertyAnimation::updateState (%s, %s, %s): starting an animation without start value",
+                             d->propertyName.constData(), d->target.data()->metaObject()->className(),
+                             qPrintable(d->target.data()->objectName()));
+                }
+                if (!endValue().isValid() && (d->direction == Forward || !d->defaultStartEndValue.isValid())) {
+                    qWarning("QPropertyAnimation::updateState (%s, %s, %s): starting an animation without end value",
+                             d->propertyName.constData(), d->target.data()->metaObject()->className(),
+                             qPrintable(d->target.data()->objectName()));
+                }
             }
         } else if (hash.value(key) == this) {
             hash.remove(key);