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

Conflicts:
	src/quick/items/qquickitem.cpp
	src/quick/items/qquicktext.cpp
	tests/auto/quick/qquicklistview/tst_qquicklistview.cpp

Change-Id: I0bc5786098193c2c40b6fd8905de75d90f6ed0cf

1 files changed, 19 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmllanguage/data/customParserBindingScopes.qml b/tests/auto/qml/qqmllanguage/data/customParserBindingScopes.qml
new file mode 100644
index 0000000000..2efc199f32
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/customParserBindingScopes.qml
@@ -0,0 +1,19 @@
+import Test 1.0
+import QtQml 2.0
+QtObject {
+    id: root
+
+    property int otherProperty: 10
+
+    property QtObject child: QtObject {
+        id: child
+
+        property int testProperty;
+        property int otherProperty: 41
+
+        property QtObject customBinder: CustomBinding {
+            target: child
+            testProperty: otherProperty + 1
+        }
+    }
+}