Merge branch remote-tracking branch 'origin/dev' into wip/pointerhandler

We no longer have any hope of getting this into 5.8.

Change-Id: I2decfa47e589ba7ae2d6b951c6517a2c311d0192

2 files changed, 20 insertions, 1 deletions

diff --git a/tests/manual/scenegraph_lancelot/data/text/text_bitmapfont.qml b/tests/manual/scenegraph_lancelot/data/text/text_bitmapfont.qml
new file mode 100644
index 0000000000..d1a289e24f
--- /dev/null
+++ b/tests/manual/scenegraph_lancelot/data/text/text_bitmapfont.qml
@@ -0,0 +1,18 @@
+// test use of Fixedsys font on Windows
+
+import QtQuick 2.0
+
+Item {
+    width: 320
+    height: 480
+
+    Text {
+        anchors.fill: parent
+        wrapMode: Text.Wrap
+        font.family: "Fixedsys"
+        font.pixelSize: 20
+        text: "Foobar"
+    }
+}
+
+
diff --git a/tests/manual/v4/fun.4.js b/tests/manual/v4/fun.4.js
index b130acccd3..277761ad09 100644
--- a/tests/manual/v4/fun.4.js
+++ b/tests/manual/v4/fun.4.js
@@ -15,4 +15,5 @@ print([10, 20, 30].filter(function (v,k,o) { return v >= 20 }));
 print([10,20,30].reduce(function(a,v,k,o) { return a + v }));
 print([10,20,30].reduceRight(function(a,v,k,o) { return a + v }));
 
-
+print([10, 20, 30].find(function (v,k,o) { return v >= 20 }));
+print([10, 20, 30].findIndex(function (v,k,o) { return v >= 20 }));