qmenu.h includes private headers

qpa includes are considered private and should not be included
in public header files.

Change-Id: I26c744ec1d8ddef7b0c11c3d26b593be05f5aa54
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

diff --git a/src/widgets/widgets/qmenu.h b/src/widgets/widgets/qmenu.h
index 1fa7195..9f17d2e 100644 (file)
--- a/src/widgets/widgets/qmenu.h
+++ b/src/widgets/widgets/qmenu.h
@@ -46,7 +46,6 @@
 #include <QtCore/qstring.h>
 #include <QtWidgets/qicon.h>
 #include <QtWidgets/qaction.h>
-#include <QtWidgets/qplatformmenu_qpa.h>
 
 #ifdef Q_OS_WINCE
 #include <windef.h> // for HMENU
@@ -61,6 +60,7 @@ QT_BEGIN_NAMESPACE
 
 class QMenuPrivate;
 class QStyleOptionMenuItem;
+class QPlatformMenu;
 
 class Q_WIDGETS_EXPORT QMenu : public QWidget
 {

diff --git a/src/widgets/widgets/qmenu_p.h b/src/widgets/widgets/qmenu_p.h
index ee6e626..d637a9b 100644 (file)
--- a/src/widgets/widgets/qmenu_p.h
+++ b/src/widgets/widgets/qmenu_p.h
@@ -61,6 +61,8 @@
 #include "QtCore/qbasictimer.h"
 #include "private/qwidget_p.h"
 
+#include <qplatformmenu_qpa.h>
+
 QT_BEGIN_NAMESPACE
 
 #ifndef QT_NO_MENU

diff --git a/src/widgets/widgets/qmenubar.h b/src/widgets/widgets/qmenubar.h
index 9818526..c1272c4 100644 (file)
--- a/src/widgets/widgets/qmenubar.h
+++ b/src/widgets/widgets/qmenubar.h
@@ -54,6 +54,7 @@ QT_BEGIN_NAMESPACE
 class QMenuBarPrivate;
 class QStyleOptionMenuItem;
 class QWindowsStyle;
+class QPlatformMenuBar;
 
 class Q_WIDGETS_EXPORT QMenuBar : public QWidget
 {