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

Conflicts:
	examples/quick/demos/photoviewer/deployment.pri
One side made it redundant; the other removed part of it; remove it all !

	src/quick/scenegraph/util/qsgatlastexture.cpp
One side changed a preprocessor condition, the other a code condition,
on adjacent lines; keep both changes.

	tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
One side changed a condition, the other the content of its block; keep both.

Change-Id: Idb8937f92a7edb28212449dfe0c5cfdb8e6de986

1 files changed, 19 insertions, 0 deletions

diff --git a/tests/auto/quick/qquickflickable/data/ratios_smallContent.qml b/tests/auto/quick/qquickflickable/data/ratios_smallContent.qml
new file mode 100644
index 0000000000..07bad683ee
--- /dev/null
+++ b/tests/auto/quick/qquickflickable/data/ratios_smallContent.qml
@@ -0,0 +1,19 @@
+import QtQuick 2.0
+
+Flickable {
+    property double heightRatioIs: visibleArea.heightRatio
+    property double widthRatioIs: visibleArea.widthRatio
+
+    width: 200
+    height: 200
+    contentWidth: item.width
+    contentHeight: item.height
+    topMargin: 20
+    leftMargin: 40
+
+    Item {
+        id: item
+        width: 100
+        height: 100
+    }
+}