diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-03-19 16:45:15 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-03-29 19:31:14 +0100 |
| commit | d975ad4ed728553b765c61f38c1e0df899187cf5 (patch) | |
| tree | cab1916d88fb6472e051b6b81f97aa3a23407c37 /src/widgets/kernel/qapplication_p.h | |
| parent | bcaff2b06fc46fce8a3ae6d613c025c8d097229c (diff) | |
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>
Diffstat (limited to 'src/widgets/kernel/qapplication_p.h')
| -rw-r--r-- | src/widgets/kernel/qapplication_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h index f6e3e861d9..e1e391b13d 100644 --- a/src/widgets/kernel/qapplication_p.h +++ b/src/widgets/kernel/qapplication_p.h @@ -120,6 +120,9 @@ public: #ifndef QT_NO_ACTION QActionPrivate *createActionPrivate() const override; #endif +#ifndef QT_NO_SHORTCUT + QShortcutPrivate *createShortcutPrivate() const override; +#endif //modality bool isWindowBlocked(QWindow *window, QWindow **blockingWindow = nullptr) const override; |