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

Conflicts:
	.qmake.conf
	src/plugins/accessible/quick/quick.pro
	src/quick/items/qquickpincharea.cpp
	src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
	src/quick/scenegraph/qsgthreadedrenderloop.cpp

Manually adjusted for TestHTTPServer constructor change:
    tests/auto/quick/qquickimage/tst_qquickimage.cpp

Change-Id: I5e58a7c08ea92d6fc5e3bce98571c54f7b2ce08f

4 files changed, 239 insertions, 2 deletions

diff --git a/tests/auto/qmltest/animators/tst_mixed.qml b/tests/auto/qmltest/animators/tst_mixed.qml
new file mode 100644
index 0000000000..1eb0cf019f
--- /dev/null
+++ b/tests/auto/qmltest/animators/tst_mixed.qml
@@ -0,0 +1,179 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Jolla Ltd, author: <gunnar.sletta@jollamobile.com>
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** 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 Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/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 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.2
+import QtTest 1.0
+
+Item {
+    id: root;
+    width: 200
+    height: 200
+
+    TestCase {
+        id: testCase
+        name: "animators-mixed"
+        when: !rootAnimation.running
+        function test_endresult() {
+            compare(box.rootStart, 2);
+            compare(box.rootEnd, 2);
+
+            compare(parallelWithOneSequential.before, 4);
+            compare(parallelWithOneSequential.scaleUpdates, 4);
+
+            compare(parallelWithTwoSequentialNormalEndsLast.beforeAnimator, 4);
+            compare(parallelWithTwoSequentialNormalEndsLast.scaleUpdates, 4);
+            compare(parallelWithTwoSequentialNormalEndsLast.afterAnimator, 4);
+            compare(parallelWithTwoSequentialNormalEndsLast.beforePause, 4);
+            compare(parallelWithTwoSequentialNormalEndsLast.afterPause, 4);
+
+            compare(parallelWithTwoSequentialNormalEndsFirst.beforeAnimator, 4);
+            compare(parallelWithTwoSequentialNormalEndsFirst.scaleUpdates, 4);
+            compare(parallelWithTwoSequentialNormalEndsFirst.afterAnimator, 4);
+            compare(parallelWithTwoSequentialNormalEndsFirst.beforePause, 4);
+            compare(parallelWithTwoSequentialNormalEndsFirst.afterPause, 4);
+
+        }
+    }
+
+    Box {
+        id: box
+
+        property int rootStart : 0
+        property int rootEnd : 0;
+
+        SequentialAnimation {
+            id: rootAnimation
+
+            running: true
+            loops: 2
+
+            ScriptAction { script: box.rootStart++; }
+
+            ParallelAnimation {
+                id: parallelWithOneSequential
+                property int before : 0;
+                property int scaleUpdates : 0;
+                loops: 2
+                SequentialAnimation {
+                    ScriptAction { script: {
+                            parallelWithOneSequential.before++;
+                            box.scale = 1;
+                            box.scaleChangeCounter = 0;
+                        }
+                    }
+                    ScaleAnimator { target: box; from: 1; to: 2; duration: 100; }
+                    ScriptAction { script: {
+                            parallelWithOneSequential.scaleUpdates += box.scaleChangeCounter;
+                        }
+                    }
+                }
+            }
+
+            ParallelAnimation {
+                id: parallelWithTwoSequentialNormalEndsLast
+                property int beforeAnimator : 0;
+                property int scaleUpdates : 0;
+                property int afterAnimator : 0;
+                property int beforePause : 0;
+                property int afterPause : 0;
+                loops: 2
+                SequentialAnimation {
+                    ScriptAction { script: {
+                            parallelWithTwoSequentialNormalEndsLast.beforeAnimator++;
+                            box.scale = 1;
+                            box.scaleChangeCounter = 0;
+                        }
+                    }
+                    ScaleAnimator { target: box; from: 1; to: 2; duration: 100; }
+                    ScriptAction { script: {
+                            parallelWithTwoSequentialNormalEndsLast.scaleUpdates += box.scaleChangeCounter;
+                            parallelWithTwoSequentialNormalEndsLast.afterAnimator++;
+                        }
+                    }
+                }
+                SequentialAnimation {
+                    ScriptAction { script: {
+                            parallelWithTwoSequentialNormalEndsLast.beforePause++
+                        }
+                    }
+                    PauseAnimation { duration: 200 }
+                    ScriptAction { script: {
+                            parallelWithTwoSequentialNormalEndsLast.afterPause++
+                        }
+                    }
+                }
+            }
+
+            ParallelAnimation {
+                id: parallelWithTwoSequentialNormalEndsFirst
+                property int beforeAnimator : 0;
+                property int scaleUpdates : 0;
+                property int afterAnimator : 0;
+                property int beforePause : 0;
+                property int afterPause : 0;
+                loops: 2
+                SequentialAnimation {
+                    ScriptAction { script: {
+                            parallelWithTwoSequentialNormalEndsFirst.beforeAnimator++;
+                            box.scale = 1;
+                            box.scaleChangeCounter = 0;
+                        }
+                    }
+                    ScaleAnimator { target: box; from: 1; to: 2; duration: 200; }
+                    ScriptAction { script: {
+                            parallelWithTwoSequentialNormalEndsFirst.scaleUpdates += box.scaleChangeCounter;
+                            parallelWithTwoSequentialNormalEndsFirst.afterAnimator++;
+                        }
+                    }
+                }
+                SequentialAnimation {
+                    ScriptAction { script: parallelWithTwoSequentialNormalEndsFirst.beforePause++ }
+                    PauseAnimation { duration: 100 }
+                    ScriptAction { script: parallelWithTwoSequentialNormalEndsFirst.afterPause++ }
+                }
+            }
+
+            ScriptAction { script: box.rootEnd++; }
+        }
+
+    }
+
+}
diff --git a/tests/auto/qmltest/animators/tst_on.qml b/tests/auto/qmltest/animators/tst_on.qml
index 7930dc5be3..b3fc719dcc 100644
--- a/tests/auto/qmltest/animators/tst_on.qml
+++ b/tests/auto/qmltest/animators/tst_on.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the test suite of the Qt Toolkit.
@@ -54,7 +54,7 @@ Item {
               && !anims.running && !animr.running
               && !animo.running;
         function test_endresult() {
-            compare(box.xChangeCounter, 1);
+            tryCompare(box, 'xChangeCounter', 1);
             compare(box.yChangeCounter, 1);
             compare(box.scaleChangeCounter, 1);
             compare(box.rotationChangeCounter, 1);
diff --git a/tests/auto/qmltest/listview/tst_listview.qml b/tests/auto/qmltest/listview/tst_listview.qml
index 0589e7c46b..03be57909f 100644
--- a/tests/auto/qmltest/listview/tst_listview.qml
+++ b/tests/auto/qmltest/listview/tst_listview.qml
@@ -102,6 +102,23 @@ Item {
         }
     }
 
+    ListView {
+        id: listViewDelegateModelAfterCreate
+        anchors.fill: parent
+        property int createdDelegates: 0
+    }
+
+    Component {
+        id: delegateModelAfterCreateComponent
+        Rectangle {
+            width: 140
+            height: 140
+            border.color: "black"
+            color: "red"
+            Component.onCompleted: listViewDelegateModelAfterCreate.createdDelegates++;
+        }
+    }
+
     ListModel { id: emptymodel }
     ListModel { id: manyitems }
     ListModel { id: firstmodel; ListElement { name: "FirstModelElement0" } }
@@ -249,5 +266,11 @@ Item {
                 asyncListViewLoaderView.currentIndex = 4;
             }
         }
+
+        function test_set_delegate_model_after_list_creation() {
+            listViewDelegateModelAfterCreate.delegate = delegateModelAfterCreateComponent;
+            listViewDelegateModelAfterCreate.model = 40;
+            verify(listViewDelegateModelAfterCreate.createdDelegates > 0);
+        }
     }
 }
diff --git a/tests/auto/qmltest/pathview/tst_pathview.qml b/tests/auto/qmltest/pathview/tst_pathview.qml
new file mode 100644
index 0000000000..820034c960
--- /dev/null
+++ b/tests/auto/qmltest/pathview/tst_pathview.qml
@@ -0,0 +1,35 @@
+import QtQuick 2.1
+import QtTest 1.0
+
+Item {
+    id: top
+
+    PathView {
+        id: pathViewDelegateModelAfterCreate
+        anchors.fill: parent
+        property int createdDelegates: 0
+        path: Path { startX: 120; startY: 100 }
+    }
+
+    Component {
+        id: delegateModelAfterCreateComponent
+        Rectangle {
+            width: 140
+            height: 140
+            border.color: "black"
+            color: "red"
+            Component.onCompleted: pathViewDelegateModelAfterCreate.createdDelegates++;
+        }
+    }
+
+    TestCase {
+        name: "PathView"
+        when: windowShown
+
+        function test_set_delegate_model_after_path_creation() {
+            pathViewDelegateModelAfterCreate.delegate = delegateModelAfterCreateComponent;
+            pathViewDelegateModelAfterCreate.model = 40;
+            verify(pathViewDelegateModelAfterCreate.createdDelegates > 0);
+        }
+    }
+}