Merge remote-tracking branch 'origin/5.10.0' into 5.10

Change-Id: I81e56b18d07156e987cfad5b185fc365b2c745b8

4 files changed, 71 insertions, 19 deletions

diff --git a/dist/changes-5.10.0 b/dist/changes-5.10.0
new file mode 100644
index 00000000..9929a04b
--- /dev/null
+++ b/dist/changes-5.10.0
@@ -0,0 +1,38 @@
+Qt 5.10 introduces many new features and improvements as well as bugfixes
+over the 5.9.x series. 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.10 series is binary compatible with the 5.10.x series.
+Applications compiled for 5.9 will continue to run with 5.10.
+
+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.10.0 Changes                           *
+****************************************************************************
+
+Calendar
+--------
+
+ - [QTBUG-60217] Added locale property, which affects which day is shown as
+   the first day of the week, as well as date and day name localization.
+
+FileDialog
+----------
+
+ - [QTBUG-39230] Added defaultSuffix property, that is added to selected
+   files that have no suffix specified.
+
+Slider
+------
+
+ - [QTBUG-59271] Added wheelEnabled property, which makes it possible to
+   disable mouse wheel.
diff --git a/dist/changes-5.9.3 b/dist/changes-5.9.3
new file mode 100644
index 00000000..d30da17d
--- /dev/null
+++ b/dist/changes-5.9.3
@@ -0,0 +1,26 @@
+Qt 5.9.3 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.3 Changes                           *
+****************************************************************************
+
+ - Slider:
+   * [QTBUG-63354] Fixed the handle position to get updated when the maximum
+     value changes.
diff --git a/src/dialogs/doc/qtquickdialogs.qdocconf b/src/dialogs/doc/qtquickdialogs.qdocconf
index ccb555a7..c617e27d 100644
--- a/src/dialogs/doc/qtquickdialogs.qdocconf
+++ b/src/dialogs/doc/qtquickdialogs.qdocconf
@@ -28,6 +28,8 @@ exampledirs += ../../../examples/quickcontrols/dialogs
 
 examplesinstallpath = quickcontrols/dialogs
 
+manifestmeta.highlighted.names = "QtQuickDialogs/Qt Quick System Dialog Examples"
+
 headerdirs += ..
 
 sourcedirs += ..
diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml
index ce8b6c42..c380c63a 100644
--- a/tests/auto/controls/data/tst_combobox.qml
+++ b/tests/auto/controls/data/tst_combobox.qml
@@ -66,14 +66,6 @@ TestCase {
 
     property var model
 
-    Timer {
-        id: timer
-        running: true
-        repeat: false
-        interval: 500
-        onTriggered: testCase.keyPress(Qt.Key_Escape)
-    }
-
     function init() {
         model = Qt.createQmlObject("import QtQuick 2.2; ListModel {}", testCase, '')
         model.append({ text: "Banana", color: "Yellow" })
@@ -505,20 +497,14 @@ TestCase {
         var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.2 ; ComboBox { model: 4 }', container, '');
         comboBox.activeFocusOnPress = false
         verify(!comboBox.activeFocus)
-        if (Qt.platform.os === "osx") // on mac when the menu open, the __popup function does not return
-            timer.start()
-        else // two mouse clicks to open and close the popup menu
-            mouseClick(comboBox, comboBox.x + 1, comboBox.y + 1)
+        // two mouse clicks to open and close the popup menu
+        mouseClick(comboBox, comboBox.x + 1, comboBox.y + 1)
         mouseClick(comboBox, comboBox.x + 1, comboBox.y + 1)
         verify(!comboBox.activeFocus)
         comboBox.activeFocusOnPress = true
-        if (Qt.platform.os === "osx") { // on macOS when the menu open, the __popup function does not return
-            timer.start()
-        } else {
-            // two mouse clicks to open and close the popup menu. The 1ms delay between mouse presses is
-            // needed with software quick renderer. Without the delay, this test is flaky.
-            mouseClick(comboBox, comboBox.x + 1, comboBox.y + 1, Qt.LeftButton, Qt.NoModifier, 1)
-        }
+        // two mouse clicks to open and close the popup menu. The 1ms delay between mouse presses is
+        // needed with software quick renderer. Without the delay, this test is flaky.
+        mouseClick(comboBox, comboBox.x + 1, comboBox.y + 1, Qt.LeftButton, Qt.NoModifier, 1)
         mouseClick(comboBox, comboBox.x + 1, comboBox.y + 1)
         verify(comboBox.activeFocus)
         comboBox.destroy()