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

 Conflicts:
	.qmake.conf

Change-Id: I542d108313b1d1566875aed2905ed6b92b9288f0

5 files changed, 69 insertions, 6 deletions

diff --git a/dist/changes-5.9.5 b/dist/changes-5.9.5
new file mode 100644
index 00000000..f6b74927
--- /dev/null
+++ b/dist/changes-5.9.5
@@ -0,0 +1,39 @@
+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.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.5 Changes                              *
+****************************************************************************
+
+Controls
+--------
+
+ - Menu:
+   * [QTBUG-55251] Fixed opening position on high-DPI screens.
+
+Dialogs
+-------
+
+ - Dialog:
+   * Fixed a minor memory leak in QQuickAbstractDialog. If Dialog's
+     decoration component is not an Item based object, there was a minor
+     memory leak in error cleanup path, causing the object to leak.
+ - FileDialog:
+  * [QTBUG-53707] Fixed a binding loop warning for the lazily populated
+    shortcuts property that never changes after being populated.
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/quickcontrols/extras/dashboard/qml/DashboardGaugeStyle.qml b/examples/quickcontrols/extras/dashboard/qml/DashboardGaugeStyle.qml
index feb85a5f..d8340846 100644
--- a/examples/quickcontrols/extras/dashboard/qml/DashboardGaugeStyle.qml
+++ b/examples/quickcontrols/extras/dashboard/qml/DashboardGaugeStyle.qml
@@ -101,7 +101,7 @@ CircularGaugeStyle {
         ctx.stroke();
 
         ctx.beginPath();
-        var gradient = ctx.createRadialGradient(xCenter, yCenter, outerRadius * 0.8, xCenter, yCenter, outerRadius);
+        var gradient = ctx.createRadialGradient(xCenter, yCenter, 0, xCenter, yCenter, outerRadius * 1.5);
         gradient.addColorStop(0, Qt.rgba(1, 1, 1, 0));
         gradient.addColorStop(0.7, Qt.rgba(1, 1, 1, 0.13));
         gradient.addColorStop(1, Qt.rgba(1, 1, 1, 1));
diff --git a/src/controls/Styles/Base/HandleStyleHelper.qml b/src/controls/Styles/Base/HandleStyleHelper.qml
index 30e62d79..78059bfe 100644
--- a/src/controls/Styles/Base/HandleStyleHelper.qml
+++ b/src/controls/Styles/Base/HandleStyleHelper.qml
@@ -67,8 +67,8 @@ QtObject {
         }
 
         ctx.beginPath();
-        var gradient = ctx.createRadialGradient(handleX, handleY, handleWidth / 2,
-            handleX, handleY, handleWidth);
+        var gradient = ctx.createRadialGradient(handleX, handleY, 0,
+            handleX, handleY, handleWidth * 1.5);
         gradient.addColorStop(0, handleColorTop);
         gradient.addColorStop(handleColorBottomStop, handleColorBottom);
         ctx.ellipse(handleX, handleY, handleWidth, handleHeight);
diff --git a/src/extras/Private/CircularButtonStyleHelper.qml b/src/extras/Private/CircularButtonStyleHelper.qml
index 55154ae2..713d727f 100644
--- a/src/extras/Private/CircularButtonStyleHelper.qml
+++ b/src/extras/Private/CircularButtonStyleHelper.qml
@@ -96,7 +96,7 @@ QtObject {
         ctx.lineWidth = outerArcLineWidth;
         ctx.arc(xCenter, yCenter, outerArcRadius, 0, Math.PI * 2, false);
         var gradient = ctx.createRadialGradient(xCenter, yCenter - halfRadius,
-            halfRadius, xCenter, yCenter - halfRadius, radius);
+            0, xCenter, yCenter - halfRadius, radius * 1.5);
         gradient.addColorStop(0, outerArcColorTop);
         gradient.addColorStop(1, outerArcColorBottom);
         ctx.strokeStyle = gradient;
@@ -126,8 +126,8 @@ QtObject {
         /* Draw the button's body */
         ctx.beginPath();
         ctx.ellipse(xCenter - radius, yCenter - radius, radius * 2, radius * 2);
-        gradient = ctx.createRadialGradient(xCenter, yCenter + radius * 0.85, radius,
-            xCenter, yCenter + radius * 0.85, radius * 0.85);
+        gradient = ctx.createRadialGradient(xCenter, yCenter + radius * 0.85, 0,
+            xCenter, yCenter + radius * 0.85, radius * (0.85 * 2));
         gradient.addColorStop(1, buttonColorTop);
         gradient.addColorStop(0, buttonColorBottom);
         ctx.fillStyle = gradient;