Merge remote-tracking branch 'origin/5.6' into 5.7

This change also fixes the build of two benchmarks, tst_affectors
and tst_emission.

Conflicts:
	src/plugins/qmltooling/qmldbg_native/qmldbg_native.pro
	src/qml/qml/ftw/qhashfield_p.h
	tests/benchmarks/particles/affectors/tst_affectors.cpp
	tests/benchmarks/particles/emission/tst_emission.cpp
	tests/benchmarks/qml/pointers/pointers.pro
	tests/benchmarks/qml/pointers/tst_pointers.cpp
	tests/benchmarks/qml/qmltime/qmltime.pro
	tests/benchmarks/qml/qquickwindow/qquickwindow.pro

Change-Id: I595309d1e183c18371cb9b07af6e4681059de3b2

2 files changed, 35 insertions, 0 deletions

diff --git a/tests/auto/qmltest/animators/tst_zeroduration.qml b/tests/auto/qmltest/animators/tst_zeroduration.qml
new file mode 100644
index 0000000000..83ce235f42
--- /dev/null
+++ b/tests/auto/qmltest/animators/tst_zeroduration.qml
@@ -0,0 +1,35 @@
+import QtQuick 2.2
+import QtTest 1.1
+
+Item {
+    id: root;
+    width: 200
+    height: 200
+
+    TestCase {
+        id: testCase
+        name: "animators-y"
+        when: box.y == 100
+        function test_endresult() {
+            compare(box.yChangeCounter, 1);
+            var image = grabImage(root);
+            verify(image.pixel(0, 100) == Qt.rgba(1, 0, 0));
+            verify(image.pixel(0, 99) == Qt.rgba(1, 1, 1)); // outside on the top
+        }
+    }
+
+    Box {
+        id: box
+
+        anchors.centerIn: undefined
+
+        YAnimator {
+            id: animation
+            target: box
+            from: 0;
+            to: 100
+            duration: 0
+            running: true
+        }
+    }
+}
diff --git a/tests/auto/qmltest/borderimage/colors.png b/tests/auto/qmltest/borderimage/colors.png
index dfb62f3d64..57f5aca821 100644
--- a/tests/auto/qmltest/borderimage/colors.png
+++ b/tests/auto/qmltest/borderimage/colors.png