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

 Conflicts:
	.qmake.conf

Change-Id: Ib2a417a6482e5c34f403968313e3285b3a54e30d

3 files changed, 50 insertions, 2 deletions

diff --git a/dist/changes-5.9.5 b/dist/changes-5.9.5
new file mode 100644
index 00000000..8df339e6
--- /dev/null
+++ b/dist/changes-5.9.5
@@ -0,0 +1,24 @@
+Qt 5.9.5 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.9.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.9 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.9 will continue to run with 5.9.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                            Qt 5.9.5 Changes                              *
+****************************************************************************
+
+ - This release contains only minor code improvements.
diff --git a/dist/changes-5.9.6 b/dist/changes-5.9.6
new file mode 100644
index 00000000..f0179a5a
--- /dev/null
+++ b/dist/changes-5.9.6
@@ -0,0 +1,24 @@
+Qt 5.9.6 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.9.0 through 5.9.5.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.9 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.8 will continue to run with 5.9.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                              Qt 5.9.6 Changes                            *
+****************************************************************************
+
+ - This release contains only minor code improvements.
diff --git a/examples/sensors/accelbubble/accelbubble.qml b/examples/sensors/accelbubble/accelbubble.qml
index 8bd036ff..f26179ff 100644
--- a/examples/sensors/accelbubble/accelbubble.qml
+++ b/examples/sensors/accelbubble/accelbubble.qml
@@ -101,10 +101,10 @@ ApplicationWindow {
     }
 
     function calcPitch(x,y,z) {
-        return -Math.atan2(y, Math.hypot(x, z)) * mainWindow.radians_to_degrees;
+        return -Math.atan2(y, Math.sqrt(x * x + z * z)) * mainWindow.radians_to_degrees;
     }
     function calcRoll(x,y,z) {
-        return -Math.atan2(x, Math.hypot(y, z)) * mainWindow.radians_to_degrees;
+        return -Math.atan2(x, Math.sqrt(y * y + z * z)) * mainWindow.radians_to_degrees;
     }
 
     Image {