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, 21 insertions, 0 deletions

diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/vector2d_compare.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/vector2d_compare.qml
new file mode 100644
index 0000000000..eb8fb5bb76
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/vector2d_compare.qml
@@ -0,0 +1,21 @@
+import Test 1.0
+
+MyTypeObject {
+    property real v_x: vector2.x
+    property real v_y: vector2.y
+    property variant copy: vector2
+    property string tostring: vector2.toString()
+
+    // compare to string
+    property bool equalsString: (vector2 == tostring)
+
+    // compare vector2ds to various value types
+    property bool equalsColor: (vector2 == Qt.rgba(0.2, 0.88, 0.6, 0.34)) // false
+    property bool equalsVector3d: (vector2 == Qt.vector3d(1, 2, 3))       // false
+    property bool equalsSize: (vector2 == Qt.size(1912, 1913))            // false
+    property bool equalsPoint: (vector2 == Qt.point(10, 4))               // false
+    property bool equalsRect: (vector2 == Qt.rect(2, 3, 109, 102))        // false
+
+    property bool equalsSelf: (vector2 == vector2)
+}
+