QQuickAbstractButton: don't accept key release if we're not pressed

A control should have been pressed if it's going to accept a release.
This prevents an issue where a menu opened by pressing enter (handled
via attached Keys property) would instantly trigger the first menu
item.

Fixes: QTBUG-83698
Change-Id: I6b1afbb76f37623012472b2b1148b4862c159239
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
(cherry picked from commit a5e1c787f6512013a092f7708c6928b5a9e263c2)
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

3 files changed, 125 insertions, 1 deletions

diff --git a/src/quicktemplates2/qquickabstractbutton.cpp b/src/quicktemplates2/qquickabstractbutton.cpp
index 0aa8ec28..5eb8477a 100644
--- a/src/quicktemplates2/qquickabstractbutton.cpp
+++ b/src/quicktemplates2/qquickabstractbutton.cpp
@@ -1052,7 +1052,7 @@ void QQuickAbstractButton::keyReleaseEvent(QKeyEvent *event)
 {
     Q_D(QQuickAbstractButton);
     QQuickControl::keyReleaseEvent(event);
-    if (d->acceptKeyClick(static_cast<Qt::Key>(event->key()))) {
+    if (d->pressed && d->acceptKeyClick(static_cast<Qt::Key>(event->key()))) {
         setPressed(false);
 
         nextCheckState();
diff --git a/tests/auto/qquickmenu/data/giveMenuItemFocusOnButtonPress.qml b/tests/auto/qquickmenu/data/giveMenuItemFocusOnButtonPress.qml
new file mode 100644
index 00000000..f9b37abb
--- /dev/null
+++ b/tests/auto/qquickmenu/data/giveMenuItemFocusOnButtonPress.qml
@@ -0,0 +1,97 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+
+ApplicationWindow {
+    width: 640
+    height: 480
+
+    property alias menuButton: menuButton
+    property alias menu: menu
+
+    signal menuButtonClicked
+
+    Button {
+        id: menuButton
+        text: "Open menu"
+
+        // Buttons do not emit clicked() for enter/return, hence the Keys usage.
+        // The signal is just for the test to ensure that the return was actually handled.
+        Keys.onReturnPressed: {
+            menuButtonClicked()
+            menu.open()
+        }
+    }
+
+    Menu {
+        id: menu
+        parent: menuButton
+
+        onOpened: command1.forceActiveFocus()
+
+        MenuItem {
+            id: command1
+            objectName: text
+            text: "Command 1"
+        }
+
+        MenuItem {
+            objectName: text
+            text: "Command 2"
+        }
+
+        MenuItem {
+            objectName: text
+            text: "Command 3"
+        }
+    }
+}
diff --git a/tests/auto/qquickmenu/tst_qquickmenu.cpp b/tests/auto/qquickmenu/tst_qquickmenu.cpp
index 092f1b75..ee3b2245 100644
--- a/tests/auto/qquickmenu/tst_qquickmenu.cpp
+++ b/tests/auto/qquickmenu/tst_qquickmenu.cpp
@@ -101,6 +101,7 @@ private slots:
     void menuItemWidthAfterImplicitWidthChanged_data();
     void menuItemWidthAfterImplicitWidthChanged();
     void menuItemWidthAfterRetranslate();
+    void giveMenuItemFocusOnButtonPress();
 };
 
 void tst_QQuickMenu::defaults()
@@ -1846,6 +1847,32 @@ void tst_QQuickMenu::menuItemWidthAfterRetranslate()
     }
 }
 
+void tst_QQuickMenu::giveMenuItemFocusOnButtonPress()
+{
+    QQuickApplicationHelper helper(this, QLatin1String("giveMenuItemFocusOnButtonPress.qml"));
+    QVERIFY2(helper.ready, helper.failureMessage());
+    QQuickApplicationWindow *window = helper.appWindow;
+    window->show();
+    QVERIFY(QTest::qWaitForWindowActive(window));
+
+    // Press enter on the button to open the menu.
+    QQuickButton *menuButton = window->property("menuButton").value<QQuickButton*>();
+    QVERIFY(menuButton);
+    menuButton->forceActiveFocus();
+    QVERIFY(menuButton->hasActiveFocus());
+
+    QSignalSpy clickedSpy(window, SIGNAL(menuButtonClicked()));
+    QVERIFY(clickedSpy.isValid());
+
+    QTest::keyClick(window, Qt::Key_Return);
+    QCOMPARE(clickedSpy.count(), 1);
+
+    // The menu should still be open.
+    QQuickMenu *menu = window->property("menu").value<QQuickMenu*>();
+    QVERIFY(menu);
+    QTRY_VERIFY(menu->isOpened());
+}
+
 QTEST_QUICKCONTROLS_MAIN(tst_QQuickMenu)
 
 #include "tst_qquickmenu.moc"