From e333c1ac2d0e68a1820073e8f68f467fc73863b3 Mon Sep 17 00:00:00 2001
From: Mitch Curtis <mitch.curtis@theqtcompany.com>
Date: Tue, 8 Dec 2015 12:50:08 +0100
Subject: Don't warn about non-existent default properties when one was found

When at least one default property of a target object is considered
valid by an animation, we don't need to warn about other default
properties that weren't found.

Change-Id: I648f17a55fdfcbed2b4c7e94d88206c3dc3d1a32
Task-number: QTBUG-22141
Reviewed-by: Michael Brasser <michael.brasser@live.com>
---
 src/quick/util/qquickanimation.cpp | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

(limited to 'src/quick/util/qquickanimation.cpp')

diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp
index 1d0dbf64b3..22bfd7aef1 100644
--- a/src/quick/util/qquickanimation.cpp
+++ b/src/quick/util/qquickanimation.cpp
@@ -178,14 +178,22 @@ void QQuickAbstractAnimationPrivate::commence()
     }
 }
 
-QQmlProperty QQuickAbstractAnimationPrivate::createProperty(QObject *obj, const QString &str, QObject *infoObj)
+QQmlProperty QQuickAbstractAnimationPrivate::createProperty(QObject *obj, const QString &str, QObject *infoObj, QString *errorMessage)
 {
     QQmlProperty prop(obj, str, qmlContext(infoObj));
     if (!prop.isValid()) {
-        qmlInfo(infoObj) << QQuickAbstractAnimation::tr("Cannot animate non-existent property \"%1\"").arg(str);
+        const QString message = QQuickAbstractAnimation::tr("Cannot animate non-existent property \"%1\"").arg(str);
+        if (errorMessage)
+            *errorMessage = message;
+        else
+            qmlInfo(infoObj) << message;
         return QQmlProperty();
     } else if (!prop.isWritable()) {
-        qmlInfo(infoObj) << QQuickAbstractAnimation::tr("Cannot animate read-only property \"%1\"").arg(str);
+        const QString message = QQuickAbstractAnimation::tr("Cannot animate read-only property \"%1\"").arg(str);
+        if (errorMessage)
+            *errorMessage = message;
+        else
+            qmlInfo(infoObj) << message;
         return QQmlProperty();
     }
     return prop;
@@ -2584,18 +2592,28 @@ QQuickStateActions QQuickPropertyAnimation::createTransitionActions(QQuickStateA
     if (defaultTarget && targets.isEmpty())
         targets << defaultTarget;
 
+    bool usingDefaultProperties = false;
     if (props.isEmpty() && !d->defaultProperties.isEmpty()) {
         props << d->defaultProperties.split(QLatin1Char(','));
+        usingDefaultProperties = true;
     }
 
     bool hasExplicit = false;
     //an explicit animation has been specified
     if (d->toIsDefined) {
+        QVector<QString> errorMessages;
+        bool successfullyCreatedDefaultProperty = false;
+
         for (int i = 0; i < props.count(); ++i) {
             for (int j = 0; j < targets.count(); ++j) {
                 QQuickStateAction myAction;
-                myAction.property = d->createProperty(targets.at(j), props.at(i), this);
+                QString errorMessage;
+                const QString propertyName = props.at(i);
+                myAction.property = d->createProperty(targets.at(j), propertyName, this, &errorMessage);
                 if (myAction.property.isValid()) {
+                    if (usingDefaultProperties)
+                        successfullyCreatedDefaultProperty = true;
+
                     if (d->fromIsDefined) {
                         myAction.fromValue = d->from;
                         d->convertVariant(myAction.fromValue, d->interpolatorType ? d->interpolatorType : myAction.property.propertyType());
@@ -2612,9 +2630,16 @@ QQuickStateActions QQuickPropertyAnimation::createTransitionActions(QQuickStateA
                             break;  //### any chance there could be multiples?
                         }
                     }
+                } else {
+                    errorMessages.append(errorMessage);
                 }
             }
         }
+
+        if (!successfullyCreatedDefaultProperty) {
+            foreach (const QString &errorMessage, errorMessages)
+                qmlInfo(this) << errorMessage;
+        }
     }
 
     if (!hasExplicit)
-- 
cgit v1.2.3