diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 13:36:29 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 14:10:58 +0100 |
| commit | 3b512ae142017f105f297467f74dc28d3cb9030a (patch) | |
| tree | 9e131e23c01537f051851a1da9576c1e1ddf5ba2 /src/widgets/widgets/qmenubar_p.h | |
| parent | e20c4730192f312881591fb50e571af0a88fe421 (diff) | |
| parent | f956f9a83603a3df5651e3238c24e8df37558d6e (diff) | |
Merge master into api_changes
Change-Id: I93551e4d13a1b0815b359b9415060e9089477db1
Diffstat (limited to 'src/widgets/widgets/qmenubar_p.h')
| -rw-r--r-- | src/widgets/widgets/qmenubar_p.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/widgets/widgets/qmenubar_p.h b/src/widgets/widgets/qmenubar_p.h index 9e1d3179c7..139f5703de 100644 --- a/src/widgets/widgets/qmenubar_p.h +++ b/src/widgets/widgets/qmenubar_p.h @@ -53,7 +53,6 @@ // We mean it. // -#ifndef QMAC_Q3MENUBAR_CPP_FILE #include "QtWidgets/qstyleoption.h" #include <private/qmenu_p.h> // Mac needs what in this file! @@ -190,7 +189,6 @@ public: QAction *menuBarAction; #endif }; -#endif #endif // QT_NO_MENUBAR |