Merge remote-tracking branch 'origin/5.5.1' into 5.5

Change-Id: Iad7030d43a688e9f10761619607ce42b44d54012

3 files changed, 61 insertions, 1 deletions

diff --git a/dist/changes-5.5.1 b/dist/changes-5.5.1
new file mode 100644
index 00000000..da2a6415
--- /dev/null
+++ b/dist/changes-5.5.1
@@ -0,0 +1,59 @@
+Qt 5.5.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.5.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.5 series is binary compatible with the 5.4.x series.
+Applications compiled for 5.4 will continue to run with 5.5.
+
+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.
+
+****************************************************************************
+*                          Controls                                        *
+****************************************************************************
+
+ - ComboBox:
+   * [QTBUG-46611] Fixed the selected text to follow model changes
+
+ - Menu:
+   * [QTBUG-47092] Fixed popups so that they do not cross screen boundaries
+   * Made MenuBar, Menu properly accessible
+   * [QTBUG-47233] Removed native menus from native menubar on destruction
+   * [QTBUG-45131] Android: fixed hardware menu button to open the options menu
+   * iOS: added shortcuts to edit menu items
+
+ - TableView:
+   * [QTBUG-46468] Fixed extra row with headerVisible:false
+   * [QTBUG-44185] Made sort indicator follow moved columns
+
+ - TextArea:
+   * [QTBUG-41375] Fixed EditMenu so that it does not clear the text selection
+
+ - TreeView:
+   * [QTBUG-46891] Fixed to track model indexes during selection
+
+****************************************************************************
+*                          Dialogs                                         *
+****************************************************************************
+
+ - General:
+   * Changed to emit accepted and rejected signals instead of calling accept
+     and reject. Don't close the dialog by default for Help, Apply, Reset
+
+ - FileDialog:
+   * [QTBUG-46688] Ensured that options are set early enough
+
+****************************************************************************
+*                          Styles                                          *
+****************************************************************************
+
+ - [QTBUG-46960][QTBUG-46881] Fixed some minor issues about Android style
diff --git a/src/controls/MenuBar.qml b/src/controls/MenuBar.qml
index 0d9f8ee8..be182e29 100644
--- a/src/controls/MenuBar.qml
+++ b/src/controls/MenuBar.qml
@@ -302,7 +302,7 @@ MenuBarPrivate {
             anchors.fill: parent
             hoverEnabled: Settings.hoverEnabled
 
-            onPositionChanged: updateCurrentItem(mouse, false)
+            onPositionChanged: updateCurrentItem(mouse)
             onPressed: {
                 if (updateCurrentItem(mouse)) {
                     d.preselectMenuItem = false
diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml
index af1fc9dd..057ff471 100644
--- a/tests/auto/controls/data/tst_combobox.qml
+++ b/tests/auto/controls/data/tst_combobox.qml
@@ -74,6 +74,7 @@ TestCase {
     function cleanup() {
         if (model !== 0)
             model.destroy()
+        wait(0) // spin the event loop to get all popups to close
     }
 
     function test_keyupdown() {