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

Change-Id: Ie26c941c33fdd8baab49dc13b84d02e2b83af5e1

3 files changed, 34 insertions, 2 deletions

diff --git a/tests/auto/controls/data/tst_button.qml b/tests/auto/controls/data/tst_button.qml
index 136f82cc..0d226ffc 100644
--- a/tests/auto/controls/data/tst_button.qml
+++ b/tests/auto/controls/data/tst_button.qml
@@ -40,6 +40,7 @@
 
 import QtQuick 2.2
 import QtTest 1.0
+import QtQuick.Controls 1.4
 import QtQuickControlsTests 1.0
 
 Item {
@@ -278,5 +279,26 @@ TestCase {
 
         button.destroy()
     }
+
+    Component {
+        id: mnemonicButtonComponent
+
+        Button {
+            text: "&Hi"
+            enabled: false
+        }
+    }
+
+    function test_mnemonic() {
+        var button = mnemonicButtonComponent.createObject(container);
+        verify(button);
+
+        clickSpy.clear();
+        clickSpy.target = button;
+        keyClick(Qt.Key_H, Qt.AltModifier);
+        compare(clickSpy.count, 0);
+
+        button.destroy();
+    }
 }
 }
diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml
index af1fc9dd..da8c79f8 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() {
@@ -523,7 +524,7 @@ TestCase {
         verify(comboBox.data[menuIndex].__popupVisible)
 
         // close the menu before destroying the combobox
-        comboBox.data[menuIndex].__closeMenu()
+        comboBox.data[menuIndex].__closeAndDestroy()
         verify(!comboBox.data[menuIndex].__popupVisible)
 
         comboBox.destroy()
@@ -549,7 +550,7 @@ TestCase {
                 verify(comboBox.data[menuIndex].items[i].checked)
         }
         // close the menu before destroying the combobox
-        comboBox.data[menuIndex].__closeMenu()
+        comboBox.data[menuIndex].__closeAndDestroy()
         verify(!comboBox.data[menuIndex].__popupVisible)
         comboBox.destroy()
     }
diff --git a/tests/auto/extras/data/tst_tumbler.qml b/tests/auto/extras/data/tst_tumbler.qml
index bc97f35d..9f3ecc2f 100644
--- a/tests/auto/extras/data/tst_tumbler.qml
+++ b/tests/auto/extras/data/tst_tumbler.qml
@@ -175,6 +175,9 @@ Item {
         }
 
         function test_keyboardNavigation() {
+            if (Qt.platform.os === "osx")
+                skip("OS X doesn't allow tab focus for certain controls by default");
+
             var column = simpleColumn.createObject(tumbler);
             compare(tumbler.addColumn(column), column);
             column = simpleColumn.createObject(tumbler);
@@ -244,6 +247,9 @@ Item {
         }
 
         function test_itemsCorrectlyPositioned() {
+            if (Qt.platform.os === "osx")
+                skip("OS X doesn't allow tab focus for certain controls by default");
+
             // TODO: rewrite this test so that it tests supported usecases.
             // Somehow it works with the Base style. It could be rewritten to use an
             // equal amount of items for the model and visibleItemCount, judging from
@@ -346,6 +352,9 @@ Item {
         }
 
         function test_focusPastLastColumn() {
+            if (Qt.platform.os === "osx")
+                skip("OS X doesn't allow tab focus for certain controls by default");
+
             var column = dayOfMonthColumn.createObject(tumbler);
             compare(tumbler.addColumn(column), column);
             column = yearColumn.createObject(tumbler);