diff options
| author | Tasuku Suzuki <[email protected]> | 2020-06-03 06:55:14 +0900 |
|---|---|---|
| committer | Tasuku Suzuki <[email protected]> | 2020-06-04 01:52:21 +0900 |
| commit | 5a1680ef131d89190e745131c18b50a4c0871d18 (patch) | |
| tree | b708f35a1c334ab4655c03bc37414bc4ead3b224 | |
| parent | 788cd98b357fdc9dd8b0f0b1baf1033f0efa1f11 (diff) | |
Fix build without features.menu
qaction_widgets.cpp needs qwidget_p.h for qWidgetShortcutContextMatcher.
Change-Id: I9144a4158af2f25f20b6f13badd0ddcd50075b67
Reviewed-by: Volker Hilsheimer <[email protected]>
| -rw-r--r-- | src/widgets/kernel/qaction_widgets.cpp | 1 | ||||
| -rw-r--r-- | src/widgets/kernel/qaction_widgets_p.h | 4 | ||||
| -rw-r--r-- | src/widgets/widgets/qwidgettextcontrol.cpp | 5 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/widgets/kernel/qaction_widgets.cpp b/src/widgets/kernel/qaction_widgets.cpp index ff609a66a12..c93f2665969 100644 --- a/src/widgets/kernel/qaction_widgets.cpp +++ b/src/widgets/kernel/qaction_widgets.cpp @@ -40,6 +40,7 @@ #include "qaction.h" #include <private/qapplication_p.h> +#include <private/qwidget_p.h> #include "qaction_widgets_p.h" #if QT_CONFIG(menu) #include <private/qmenu_p.h> diff --git a/src/widgets/kernel/qaction_widgets_p.h b/src/widgets/kernel/qaction_widgets_p.h index 02387c73715..c301aeb9267 100644 --- a/src/widgets/kernel/qaction_widgets_p.h +++ b/src/widgets/kernel/qaction_widgets_p.h @@ -52,7 +52,9 @@ // #include <QtGui/private/qaction_p.h> +#if QT_CONFIG(menu) #include <QtWidgets/qmenu.h> +#endif QT_REQUIRE_CONFIG(action); @@ -73,10 +75,12 @@ public: QShortcutMap::ContextMatcher contextMatcher() const override; #endif +#if QT_CONFIG(menu) QPointer<QMenu> m_menu; QObject *menu() const override; void setMenu(QObject *menu) override; +#endif }; QT_END_NAMESPACE diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp index b87b4e54fa4..cb9dffc8c0f 100644 --- a/src/widgets/widgets/qwidgettextcontrol.cpp +++ b/src/widgets/widgets/qwidgettextcontrol.cpp @@ -50,15 +50,14 @@ #include <qdrag.h> #endif #include <qclipboard.h> -#if QT_CONFIG(menu) -#include <qmenu.h> -#endif #include <qstyle.h> #include <qtimer.h> #include "private/qapplication_p.h" #include "private/qtextdocumentlayout_p.h" #include "private/qabstracttextdocumentlayout_p.h" +#if QT_CONFIG(menu) #include "private/qmenu_p.h" +#endif #include "qtextdocument.h" #include "private/qtextdocument_p.h" #include "qtextlist.h" |