diff options
| author | Tasuku Suzuki <tasuku.suzuki@kdab.com> | 2020-06-04 17:39:33 +0900 |
|---|---|---|
| committer | Tasuku Suzuki <tasuku.suzuki@kdab.com> | 2020-06-05 10:23:48 +0900 |
| commit | 758ee12a9950f7cf88e38a2b6b974e3341991a53 (patch) | |
| tree | b0bd6a1f57aae3176c85ffba7a640053f8b3b463 /src | |
| parent | df2e029a06f065c82dacc28ec885b4307260b6fb (diff) | |
Fix build without features.shortcut
Change-Id: I5b0d3b169c7adb3ee340df7b593f84167f1ccc0c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qcoreevent.h | 2 | ||||
| -rw-r--r-- | src/widgets/kernel/qaction_widgets.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h index 05af1a6132..bbd95f7a96 100644 --- a/src/corelib/kernel/qcoreevent.h +++ b/src/corelib/kernel/qcoreevent.h @@ -323,7 +323,9 @@ private: friend class QCoreApplicationPrivate; friend class QThreadData; friend class QApplication; +#if QT_CONFIG(shortcut) friend class QShortcutMap; +#endif friend class QGraphicsView; friend class QGraphicsScene; friend class QGraphicsScenePrivate; diff --git a/src/widgets/kernel/qaction_widgets.cpp b/src/widgets/kernel/qaction_widgets.cpp index c93f266596..dcecb32b06 100644 --- a/src/widgets/kernel/qaction_widgets.cpp +++ b/src/widgets/kernel/qaction_widgets.cpp @@ -75,10 +75,12 @@ void QtWidgetsActionPrivate::destroy() } } +#if QT_CONFIG(shortcut) QShortcutMap::ContextMatcher QtWidgetsActionPrivate::contextMatcher() const { return qWidgetShortcutContextMatcher; } +#endif #if QT_CONFIG(menu) QObject *QtWidgetsActionPrivate::menu() const |