Merge remote-tracking branch 'origin/5.6' into dev

Conflicts:
	tests/auto/quick/qquicklistview/tst_qquicklistview.cpp

Change-Id: I9588a3e2c7d590e031dd4c66905a79f0d74d3ac8

3 files changed, 112 insertions, 0 deletions

diff --git a/tests/auto/quick/qquickanimations/data/animatorInvalidTargetCrash.qml b/tests/auto/quick/qquickanimations/data/animatorInvalidTargetCrash.qml
new file mode 100644
index 0000000000..f2c378e4b5
--- /dev/null
+++ b/tests/auto/quick/qquickanimations/data/animatorInvalidTargetCrash.qml
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtQuick module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.3
+import QtQuick.Window 2.2
+
+Window {
+    visible: true
+    width: 100
+    height: 100
+
+    OpacityAnimator {
+        id: anim
+        from: 1
+        to:0
+        duration: 5000
+        running: false
+    }
+
+    Loader {
+        id: loader
+        sourceComponent: Text {
+            text: "Hello World"
+            anchors.centerIn: parent
+        }
+    }
+
+    Component.onCompleted: {
+        anim.target = loader.item;
+        anim.start();
+        loader.active = false;
+    }
+}
diff --git a/tests/auto/quick/qquickanimations/data/defaultRotationAnimation.qml b/tests/auto/quick/qquickanimations/data/defaultRotationAnimation.qml
new file mode 100644
index 0000000000..94692add60
--- /dev/null
+++ b/tests/auto/quick/qquickanimations/data/defaultRotationAnimation.qml
@@ -0,0 +1,14 @@
+import QtQuick 2.0
+
+Rectangle {
+    id: rect
+
+    RotationAnimation {
+        target: rect
+        from: 0
+        to: 360
+        running: true
+        duration: 1000
+        loops: Animation.Infinite
+    }
+}
diff --git a/tests/auto/quick/qquickanimations/tst_qquickanimations.cpp b/tests/auto/quick/qquickanimations/tst_qquickanimations.cpp
index 2b805e9eeb..5cad68b275 100644
--- a/tests/auto/quick/qquickanimations/tst_qquickanimations.cpp
+++ b/tests/auto/quick/qquickanimations/tst_qquickanimations.cpp
@@ -104,6 +104,8 @@ private slots:
     void scriptActionBug();
     void groupAnimationNullChildBug();
     void scriptActionCrash();
+    void animatorInvalidTargetCrash();
+    void defaultPropertyWarning();
 };
 
 #define QTIMED_COMPARE(lhs, rhs) do { \
@@ -1491,7 +1493,40 @@ void tst_qquickanimations::scriptActionCrash()
     delete obj;
 }
 
+// QTBUG-49364
+// Test that we don't crash when the target of an Animator becomes
+// invalid between the time the animator is started and the time the
+// animator job is actually started
+void tst_qquickanimations::animatorInvalidTargetCrash()
+{
+    QQmlEngine engine;
+    QQmlComponent c(&engine, testFileUrl("animatorInvalidTargetCrash.qml"));
+    QObject *obj = c.create();
+
+    //just testing that we don't crash
+    QTest::qWait(5000); //animator duration
+
+    delete obj;
+}
+
+Q_DECLARE_METATYPE(QList<QQmlError>)
 
+// QTBUG-22141
+void tst_qquickanimations::defaultPropertyWarning()
+{
+    QQmlEngine engine;
+
+    qRegisterMetaType<QList<QQmlError> >();
+
+    QSignalSpy warnings(&engine, SIGNAL(warnings(QList<QQmlError>)));
+    QVERIFY(warnings.isValid());
+
+    QQmlComponent component(&engine, testFileUrl("defaultRotationAnimation.qml"));
+    QScopedPointer<QQuickItem> root(qobject_cast<QQuickItem*>(component.create()));
+    QVERIFY(root);
+
+    QVERIFY(warnings.isEmpty());
+}
 
 QTEST_MAIN(tst_qquickanimations)