From 758ee12a9950f7cf88e38a2b6b974e3341991a53 Mon Sep 17 00:00:00 2001 From: Tasuku Suzuki Date: Thu, 4 Jun 2020 17:39:33 +0900 Subject: [PATCH] Fix build without features.shortcut Change-Id: I5b0d3b169c7adb3ee340df7b593f84167f1ccc0c Reviewed-by: Volker Hilsheimer --- src/corelib/kernel/qcoreevent.h | 2 ++ src/widgets/kernel/qaction_widgets.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h index 05af1a61327..bbd95f7a965 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 c93f2665969..dcecb32b06d 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