Merge 5.5 into 5.5.1

Change-Id: I6a887182dbed50c8028bd2dbed71e48d5226fac8

3 files changed, 24 insertions, 1 deletions

diff --git a/src/controls/Private/BasicButton.qml b/src/controls/Private/BasicButton.qml
index 5de95aa9b..1756a296a 100644
--- a/src/controls/Private/BasicButton.qml
+++ b/src/controls/Private/BasicButton.qml
@@ -146,6 +146,7 @@ Control {
 
     Action {
         id: ownAction
+        enabled: button.enabled
         iconSource: !button.action || __iconOverriden ? button.iconSource : ""
         iconName: !button.action || __iconOverriden ? button.iconName : ""
 
diff --git a/src/extras/Styles/Flat/qmldir b/src/extras/Styles/Flat/qmldir
index 2b6390a4c..74a5a9672 100644
--- a/src/extras/Styles/Flat/qmldir
+++ b/src/extras/Styles/Flat/qmldir
@@ -1,3 +1,3 @@
 module QtQuick.Controls.Styles.Flat
 plugin qtquickextrasflatplugin
-classname QtQuickExtrasFlatPlugin
+classname QtQuickExtrasStylesPlugin
diff --git a/tests/auto/controls/data/tst_button.qml b/tests/auto/controls/data/tst_button.qml
index 136f82cca..0d226ffc2 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();
+    }
 }
 }