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

qmenu.h includes private headers

Browse Source 
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>
This commit is contained in:
Girish Ramakrishnan 2012-04-15 04:02:31 -07:00 committed by Qt by Nokia
parent f609035fc1
commit 41673c45dd
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/widgets/qmenu.h
View File

@ -46,7 +46,6 @@
#include <QtCore/qstring.h> #include <QtCore/qstring.h>
#include <QtWidgets/qicon.h> #include <QtWidgets/qicon.h>
#include <QtWidgets/qaction.h> #include <QtWidgets/qaction.h>
#include <QtWidgets/qplatformmenu_qpa.h>
#ifdef Q_OS_WINCE #ifdef Q_OS_WINCE
#include <windef.h> // for HMENU #include <windef.h> // for HMENU
@ -61,6 +60,7 @@ QT_BEGIN_NAMESPACE
class QMenuPrivate; class QMenuPrivate;
class QStyleOptionMenuItem; class QStyleOptionMenuItem;
class QPlatformMenu;
class Q_WIDGETS_EXPORT QMenu : public QWidget class Q_WIDGETS_EXPORT QMenu : public QWidget
{ {

2
src/widgets/widgets/qmenu_p.h
View File

@ -61,6 +61,8 @@
#include "QtCore/qbasictimer.h" #include "QtCore/qbasictimer.h"
#include "private/qwidget_p.h" #include "private/qwidget_p.h"
#include <qplatformmenu_qpa.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifndef QT_NO_MENU #ifndef QT_NO_MENU

1
src/widgets/widgets/qmenubar.h
View File

@ -54,6 +54,7 @@ QT_BEGIN_NAMESPACE
class QMenuBarPrivate; class QMenuBarPrivate;
class QStyleOptionMenuItem; class QStyleOptionMenuItem;
class QWindowsStyle; class QWindowsStyle;
class QPlatformMenuBar;
class Q_WIDGETS_EXPORT QMenuBar : public QWidget class Q_WIDGETS_EXPORT QMenuBar : public QWidget
{ {