Merge branch 'master' into refactor

Conflicts:
	src/declarative/items/qsgcanvas.cpp
	src/declarative/items/qsgitem.cpp
	src/declarative/items/qsgtextnode.cpp
	tests/auto/declarative/examples/examples.pro
	tools/qmlviewer/qmlviewer.pro

Change-Id: Icbb0ef5dc79b658c62fd2b2c25a66c9bb3cbeb10

1 files changed, 40 insertions, 0 deletions

diff --git a/tests/auto/declarative/qsgpositioners/data/horizontal-animated-disabled.qml b/tests/auto/declarative/qsgpositioners/data/horizontal-animated-disabled.qml
new file mode 100644
index 0000000000..8723ffc78f
--- /dev/null
+++ b/tests/auto/declarative/qsgpositioners/data/horizontal-animated-disabled.qml
@@ -0,0 +1,40 @@
+import QtQuick 2.0
+
+Item {
+    width: 640
+    height: 480
+
+    Row {
+        objectName: "row"
+        add: Transition {
+            enabled: false
+            NumberAnimation { properties: "x" }
+        }
+        move: Transition {
+            enabled: false
+            NumberAnimation { properties: "x" }
+        }
+        Rectangle {
+            objectName: "one"
+            color: "red"
+            x: -100;
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "two"
+            color: "blue"
+            x: -100;
+            visible: false
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "three"
+            x: -100;
+            color: "green"
+            width: 50
+            height: 50
+        }
+    }
+}