Send ShortcutOverride event when receiving a non-spontaneous key press

When a key press is received which is not spontaneous then it needs to
be manually sent as a shortcut override event to ensure that any
matching shortcut is triggered first. This enables emulation/playback
of recorded events to still have the same effect.

[ChangeLog][QtWidgets] Sending a key press event with sendEvent() now
sends a ShortCutOverride event first to the widget to trigger any
shortcuts set first.

Task-number: QTBUG-48325
Change-Id: Iafcc2cdb1773bffe89edaeb0abc44cd5a51088e6
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>

1 files changed, 37 insertions, 0 deletions

diff --git a/tests/auto/widgets/kernel/qaction/tst_qaction.cpp b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp
index ddf9ccb416..3d68e42baf 100644
--- a/tests/auto/widgets/kernel/qaction/tst_qaction.cpp
+++ b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp
@@ -67,6 +67,7 @@ private slots:
     void keysequence(); // QTBUG-53381
     void disableShortcutsWithBlockedWidgets_data();
     void disableShortcutsWithBlockedWidgets();
+    void shortcutFromKeyEvent(); // QTBUG-48325
 
 private:
     int m_lastEventType;
@@ -509,5 +510,41 @@ void tst_QAction::disableShortcutsWithBlockedWidgets()
     QCOMPARE(spy.count(), 0);
 }
 
+class ShortcutOverrideWidget : public QWidget
+{
+public:
+    ShortcutOverrideWidget(QWidget *parent = 0) : QWidget(parent), shortcutOverrideCount(0) {}
+    int shortcutOverrideCount;
+protected:
+    bool event(QEvent *e)
+    {
+        if (e->type() == QEvent::ShortcutOverride)
+            ++shortcutOverrideCount;
+        return QWidget::event(e);
+    }
+};
+
+// Test that a key press event sent with sendEvent() still gets handled as a possible
+// ShortcutOverride event first before passing it on as a normal KeyEvent.
+void tst_QAction::shortcutFromKeyEvent()
+{
+    ShortcutOverrideWidget testWidget;
+    QAction action;
+    action.setShortcut(Qt::Key_1);
+    testWidget.addAction(&action);
+    testWidget.show();
+    QSignalSpy spy(&action, &QAction::triggered);
+    QVERIFY(spy.isValid());
+    QVERIFY(QTest::qWaitForWindowActive(&testWidget));
+    QCOMPARE(testWidget.shortcutOverrideCount, 0);
+
+    // Don't use the QTest::keyPress approach as this will take the
+    // shortcut route for us
+    QKeyEvent e(QEvent::KeyPress, Qt::Key_1, Qt::NoModifier);
+    QApplication::sendEvent(&testWidget, &e);
+    QCOMPARE(spy.count(), 1);
+    QCOMPARE(testWidget.shortcutOverrideCount, 1);
+}
+
 QTEST_MAIN(tst_QAction)
 #include "tst_qaction.moc"