Merge QGuiShortcut and QShortcut again in QtGui

QShortcut has only one widget specific feature, which is whatsThis; that
is just a QString, so the setters and getters can just as well be in
QtGui.

The widgets specific implementation of shortcut matching and of showing
the whatsThis balloon stays in QtWidgets, in the private implementation.
Using virtual functions in the private we can override the empty default
in QtGui, and by adding a virtual factory function in QGuiApplication,
the correct private is instantiated depending on the kind of application
running.

Change-Id: I09ae4a5482f9fb70940c5e2bfe76d3d7fd710afc
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 82 insertions, 0 deletions

diff --git a/tests/auto/gui/kernel/qshortcut/tst_qshortcut.cpp b/tests/auto/gui/kernel/qshortcut/tst_qshortcut.cpp
new file mode 100644
index 0000000000..fd5a4bdccf
--- /dev/null
+++ b/tests/auto/gui/kernel/qshortcut/tst_qshortcut.cpp
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 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:GPL-EXCEPT$
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+#include <QtGui/qguiapplication.h>
+#include <QtGui/qshortcut.h>
+#include <QtGui/qpainter.h>
+#include <QtGui/qrasterwindow.h>
+#include <QtGui/qscreen.h>
+#include <QtGui/qwindow.h>
+
+class tst_QShortcut : public QObject
+{
+    Q_OBJECT
+public:
+
+private slots:
+    void trigger();
+};
+
+class ColoredWindow : public QRasterWindow {
+public:
+    ColoredWindow(QColor c) : m_color(c) {}
+
+protected:
+    void paintEvent(QPaintEvent *event) override;
+
+private:
+    const QColor m_color;
+};
+
+void ColoredWindow::paintEvent(QPaintEvent *)
+{
+    QPainter p(this);
+    p.fillRect(QRect(QPoint(), size()), m_color);
+}
+
+static void sendKey(QWindow *target, Qt::Key k, char c, Qt::KeyboardModifiers modifiers)
+{
+    QTest::sendKeyEvent(QTest::Press, target, k, c, modifiers);
+    QTest::sendKeyEvent(QTest::Release, target, k, c, modifiers);
+}
+
+void tst_QShortcut::trigger()
+{
+    ColoredWindow w(Qt::yellow);
+    w.setTitle(QTest::currentTestFunction());
+    w.resize(QGuiApplication::primaryScreen()->size() / 4);
+    new QShortcut(Qt::CTRL + Qt::Key_Q, &w, SLOT(close()));
+    w.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&w));
+    sendKey(&w, Qt::Key_Q, 'q', Qt::ControlModifier);
+    QTRY_VERIFY(!w.isVisible());
+}
+
+QTEST_MAIN(tst_QShortcut)
+#include "tst_qshortcut.moc"