1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build without features.shortcut

Browse Source 
Change-Id: I5b0d3b169c7adb3ee340df7b593f84167f1ccc0c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Tasuku Suzuki 2020-06-04 17:39:33 +09:00
parent df2e029a06
commit 758ee12a99
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/kernel/qcoreevent.h
View File

@ -323,7 +323,9 @@ private:
friend class QCoreApplicationPrivate; friend class QCoreApplicationPrivate;
friend class QThreadData; friend class QThreadData;
friend class QApplication; friend class QApplication;
#if QT_CONFIG(shortcut)
friend class QShortcutMap; friend class QShortcutMap;
#endif
friend class QGraphicsView; friend class QGraphicsView;
friend class QGraphicsScene; friend class QGraphicsScene;
friend class QGraphicsScenePrivate; friend class QGraphicsScenePrivate;

2
src/widgets/kernel/qaction_widgets.cpp
View File

@ -75,10 +75,12 @@ void QtWidgetsActionPrivate::destroy()
} }
} }
#if QT_CONFIG(shortcut)
QShortcutMap::ContextMatcher QtWidgetsActionPrivate::contextMatcher() const QShortcutMap::ContextMatcher QtWidgetsActionPrivate::contextMatcher() const
{ {
return qWidgetShortcutContextMatcher; return qWidgetShortcutContextMatcher;
} }
#endif
#if QT_CONFIG(menu) #if QT_CONFIG(menu)
QObject *QtWidgetsActionPrivate::menu() const QObject *QtWidgetsActionPrivate::menu() const