Fix build without features.menu

qaction_widgets.cpp needs qwidget_p.h for qWidgetShortcutContextMatcher.

Change-Id: I9144a4158af2f25f20b6f13badd0ddcd50075b67
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

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>

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

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"