Merge remote-tracking branch 'origin/dev' into wip/scenegraphng

Change-Id: I762e578aaf14a77efa26ce3fda2abb0e335003ea

11 files changed, 18 insertions, 33 deletions

diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp
index 9de474ac36..1a2441171d 100644
--- a/src/quick/util/qquickanimation.cpp
+++ b/src/quick/util/qquickanimation.cpp
@@ -192,14 +192,14 @@ QQmlProperty QQuickAbstractAnimationPrivate::createProperty(QObject *obj, const
         if (errorMessage)
             *errorMessage = message;
         else
-            qmlInfo(infoObj) << message;
+            qmlWarning(infoObj) << message;
         return QQmlProperty();
     } else if (!prop.isWritable()) {
         const QString message = QQuickAbstractAnimation::tr("Cannot animate read-only property \"%1\"").arg(str);
         if (errorMessage)
             *errorMessage = message;
         else
-            qmlInfo(infoObj) << message;
+            qmlWarning(infoObj) << message;
         return QQmlProperty();
     }
     return prop;
@@ -256,7 +256,7 @@ void QQuickAbstractAnimation::setRunning(bool r)
         return;
 
     if (d->group || d->disableUserControl) {
-        qmlInfo(this) << "setRunning() cannot be used on non-root animation nodes.";
+        qmlWarning(this) << "setRunning() cannot be used on non-root animation nodes.";
         return;
     }
 
@@ -322,12 +322,12 @@ void QQuickAbstractAnimation::setPaused(bool p)
         return;
 
     if (!d->running) {
-        qmlInfo(this) << "setPaused() cannot be used when animation isn't running.";
+        qmlWarning(this) << "setPaused() cannot be used when animation isn't running.";
         return;
     }
 
     if (d->group || d->disableUserControl) {
-        qmlInfo(this) << "setPaused() cannot be used on non-root animation nodes.";
+        qmlWarning(this) << "setPaused() cannot be used on non-root animation nodes.";
         return;
     }
 
@@ -709,7 +709,7 @@ int QQuickPauseAnimation::duration() const
 void QQuickPauseAnimation::setDuration(int duration)
 {
     if (duration < 0) {
-        qmlInfo(this) << tr("Cannot set a duration of < 0");
+        qmlWarning(this) << tr("Cannot set a duration of < 0");
         return;
     }
 
@@ -1004,7 +1004,7 @@ void QQuickScriptActionPrivate::execute()
         QQmlExpression expr(scriptStr);
         expr.evaluate();
         if (expr.hasError())
-            qmlInfo(q) << expr.error();
+            qmlWarning(q) << expr.error();
     }
 }
 
@@ -2077,7 +2077,7 @@ int QQuickPropertyAnimation::duration() const
 void QQuickPropertyAnimation::setDuration(int duration)
 {
     if (duration < 0) {
-        qmlInfo(this) << tr("Cannot set a duration of < 0");
+        qmlWarning(this) << tr("Cannot set a duration of < 0");
         return;
     }
 
@@ -2644,7 +2644,7 @@ QQuickStateActions QQuickPropertyAnimation::createTransitionActions(QQuickStateA
 
         if (!successfullyCreatedDefaultProperty) {
             for (const QString &errorMessage : qAsConst(errorMessages))
-                qmlInfo(this) << errorMessage;
+                qmlWarning(this) << errorMessage;
         }
     }
 
diff --git a/src/quick/util/qquickanimationcontroller.cpp b/src/quick/util/qquickanimationcontroller.cpp
index 4bc2d6319e..fa1ade50d1 100644
--- a/src/quick/util/qquickanimationcontroller.cpp
+++ b/src/quick/util/qquickanimationcontroller.cpp
@@ -169,7 +169,7 @@ void QQuickAnimationController::setAnimation(QQuickAbstractAnimation *animation)
     if (animation != d->animation) {
         if (animation) {
             if (animation->userControlDisabled()) {
-                qmlInfo(this) << "QQuickAnimationController::setAnimation: the animation is controlled by others, can't be used in AnimationController.";
+                qmlWarning(this) << "QQuickAnimationController::setAnimation: the animation is controlled by others, can't be used in AnimationController.";
                 return;
             }
             animation->setDisableUserControl();
diff --git a/src/quick/util/qquickanimator.cpp b/src/quick/util/qquickanimator.cpp
index 5d2af0f940..c3b5865369 100644
--- a/src/quick/util/qquickanimator.cpp
+++ b/src/quick/util/qquickanimator.cpp
@@ -50,6 +50,7 @@ QT_BEGIN_NAMESPACE
     \inqmlmodule QtQuick
     \since 5.2
     \ingroup qtquick-transitions-animations
+    \inherits Animation
     \brief Is the base of all QML animators.
 
     Animator types are a special type of animation which operate
diff --git a/src/quick/util/qquickbehavior.cpp b/src/quick/util/qquickbehavior.cpp
index 9af1d41b29..1b2d9afb7c 100644
--- a/src/quick/util/qquickbehavior.cpp
+++ b/src/quick/util/qquickbehavior.cpp
@@ -129,7 +129,7 @@ void QQuickBehavior::setAnimation(QQuickAbstractAnimation *animation)
 {
     Q_D(QQuickBehavior);
     if (d->animation) {
-        qmlInfo(this) << tr("Cannot change the animation assigned to a Behavior.");
+        qmlWarning(this) << tr("Cannot change the animation assigned to a Behavior.");
         return;
     }
 
diff --git a/src/quick/util/qquickfontloader.cpp b/src/quick/util/qquickfontloader.cpp
index d13291c30a..3761a37a6d 100644
--- a/src/quick/util/qquickfontloader.cpp
+++ b/src/quick/util/qquickfontloader.cpp
@@ -307,7 +307,7 @@ void QQuickFontLoader::updateFontInfo(const QString& name, QQuickFontLoader::Sta
     }
     if (status != d->status) {
         if (status == Error)
-            qmlInfo(this) << "Cannot load font: \"" << d->url.toString() << '"';
+            qmlWarning(this) << "Cannot load font: \"" << d->url.toString() << '"';
         d->status = status;
         emit statusChanged();
     }
diff --git a/src/quick/util/qquickpath.cpp b/src/quick/util/qquickpath.cpp
index 337d63e53b..afcbc4cc0a 100644
--- a/src/quick/util/qquickpath.cpp
+++ b/src/quick/util/qquickpath.cpp
@@ -216,20 +216,6 @@ bool QQuickPath::isClosed() const
     return d->closed;
 }
 
-bool QQuickPath::hasEnd() const
-{
-    Q_D(const QQuickPath);
-    for (int i = d->_pathElements.count() - 1; i > -1; --i) {
-        if (QQuickCurve *curve = qobject_cast<QQuickCurve *>(d->_pathElements.at(i))) {
-            if ((!curve->hasX() && !curve->hasRelativeX()) || (!curve->hasY() && !curve->hasRelativeY()))
-                return false;
-            else
-                return true;
-        }
-    }
-    return hasStartX() && hasStartY();
-}
-
 /*!
     \qmlproperty list<PathElement> QtQuick::Path::pathElements
     This property holds the objects composing the path.
diff --git a/src/quick/util/qquickpath_p.h b/src/quick/util/qquickpath_p.h
index 4bcefb032e..1c639db9ce 100644
--- a/src/quick/util/qquickpath_p.h
+++ b/src/quick/util/qquickpath_p.h
@@ -405,7 +405,6 @@ public:
     bool hasStartY() const;
 
     bool isClosed() const;
-    bool hasEnd() const;
 
     QPainterPath path() const;
     QStringList attributes() const;
diff --git a/src/quick/util/qquickpropertychanges.cpp b/src/quick/util/qquickpropertychanges.cpp
index fafa2edd0b..20aa52e472 100644
--- a/src/quick/util/qquickpropertychanges.cpp
+++ b/src/quick/util/qquickpropertychanges.cpp
@@ -397,10 +397,10 @@ QQuickPropertyChangesPrivate::property(const QString &property)
     Q_Q(QQuickPropertyChanges);
     QQmlProperty prop(object, property, qmlContext(q));
     if (!prop.isValid()) {
-        qmlInfo(q) << QQuickPropertyChanges::tr("Cannot assign to non-existent property \"%1\"").arg(property);
+        qmlWarning(q) << QQuickPropertyChanges::tr("Cannot assign to non-existent property \"%1\"").arg(property);
         return QQmlProperty();
     } else if (!(prop.type() & QQmlProperty::SignalProperty) && !prop.isWritable()) {
-        qmlInfo(q) << QQuickPropertyChanges::tr("Cannot assign to read-only property \"%1\"").arg(property);
+        qmlWarning(q) << QQuickPropertyChanges::tr("Cannot assign to read-only property \"%1\"").arg(property);
         return QQmlProperty();
     }
     return prop;
diff --git a/src/quick/util/qquickstatechangescript.cpp b/src/quick/util/qquickstatechangescript.cpp
index 86b70fe879..a70fa1a676 100644
--- a/src/quick/util/qquickstatechangescript.cpp
+++ b/src/quick/util/qquickstatechangescript.cpp
@@ -131,7 +131,7 @@ void QQuickStateChangeScript::execute()
         QQmlExpression expr(d->script);
         expr.evaluate();
         if (expr.hasError())
-            qmlInfo(this, expr.error());
+            qmlWarning(this, expr.error());
     }
 }
 
diff --git a/src/quick/util/qquickstategroup.cpp b/src/quick/util/qquickstategroup.cpp
index 200f243a1b..f2cd4638fc 100644
--- a/src/quick/util/qquickstategroup.cpp
+++ b/src/quick/util/qquickstategroup.cpp
@@ -438,7 +438,7 @@ void QQuickStateGroupPrivate::setCurrentStateInternal(const QString &state,
     }
 
     if (applyingState) {
-        qmlInfo(q) << "Can't apply a state change as part of a state definition.";
+        qmlWarning(q) << "Can't apply a state change as part of a state definition.";
         return;
     }
 
diff --git a/src/quick/util/qquickvaluetypes.cpp b/src/quick/util/qquickvaluetypes.cpp
index e673df0451..4afcb07a5c 100644
--- a/src/quick/util/qquickvaluetypes.cpp
+++ b/src/quick/util/qquickvaluetypes.cpp
@@ -56,8 +56,7 @@ namespace QQuickValueTypes {
 
 QString QQuickColorValueType::toString() const
 {
-    // to maintain behaviour with QtQuick 1.0, we just output normal toString() value.
-    return QVariant(v).toString();
+    return v.name(v.alpha() != 255 ? QColor::HexArgb : QColor::HexRgb);
 }
 
 qreal QQuickColorValueType::r() const