From c199297b655c05882479fa0c337b725ab5730153 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <j-p.nurmi@nokia.com>
Date: Wed, 15 Aug 2012 16:27:52 +0200
Subject: [PATCH] QMenuBar: fix qdoc warnings
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Removed Qt3 support left overs, marked QMenuBar::platformMenuBar()
as internal, and removed the reference to
qt_mac_set_native_menubar() that was removed in 2922f8.

Change-Id: Ia6af9bd399c88fafab26789278b4c82312d6d9c7
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
---
 src/widgets/widgets/qmenubar.cpp | 88 ++--------------------------------------
 1 file changed, 3 insertions(+), 85 deletions(-)

diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp
index d22a21b..a67f8bf 100644
--- a/src/widgets/widgets/qmenubar.cpp
+++ b/src/widgets/widgets/qmenubar.cpp
@@ -1847,8 +1847,6 @@ QWidget *QMenuBar::cornerWidget(Qt::Corner corner) const
     The default is to follow whether the Qt::AA_DontUseNativeMenuBar attribute
     is set for the application. Explicitly settings this property overrides
     the presence (or abscence) of the attribute.
-
-    \sa void-qt-mac-set-native-menubar-bool-enable
 */
 
 void QMenuBar::setNativeMenuBar(bool nativeMenuBar)
@@ -1880,6 +1878,9 @@ bool QMenuBar::isNativeMenuBar() const
     return d->nativeMenuBar;
 }
 
+/*!
+    \internal
+*/
 QPlatformMenuBar *QMenuBar::platformMenuBar()
 {
     Q_D(const QMenuBar);
@@ -1972,89 +1973,6 @@ QAction *QMenuBar::defaultAction() const
     \sa QMenu::addAction(), QWidget::addAction(), QWidget::actions()
 */
 
-/*!
-    \fn void QMenuBar::setFrameRect(QRect)
-    \internal
-*/
-
-/*!
-    \fn QRect QMenuBar::frameRect() const
-    \internal
-*/
-/*!
-    \enum QMenuBar::DummyFrame
-    \internal
-
-    \value Box
-    \value Sunken
-    \value Plain
-    \value Raised
-    \value MShadow
-    \value NoFrame
-    \value Panel
-    \value StyledPanel
-    \value HLine
-    \value VLine
-    \value GroupBoxPanel
-    \value WinPanel
-    \value ToolBarPanel
-    \value MenuBarPanel
-    \value PopupPanel
-    \value LineEditPanel
-    \value TabWidgetPanel
-    \value MShape
-*/
-
-/*!
-    \fn void QMenuBar::setFrameShadow(DummyFrame)
-    \internal
-*/
-
-/*!
-    \fn DummyFrame QMenuBar::frameShadow() const
-    \internal
-*/
-
-/*!
-    \fn void QMenuBar::setFrameShape(DummyFrame)
-    \internal
-*/
-
-/*!
-    \fn DummyFrame QMenuBar::frameShape() const
-    \internal
-*/
-
-/*!
-    \fn void QMenuBar::setFrameStyle(int)
-    \internal
-*/
-
-/*!
-    \fn int QMenuBar::frameStyle() const
-    \internal
-*/
-
-/*!
-    \fn void QMenuBar::setLineWidth(int)
-    \internal
-*/
-
-/*!
-    \fn int QMenuBar::lineWidth() const
-    \internal
-*/
-
-/*!
-    \fn void QMenuBar::setMidLineWidth(int)
-    \internal
-*/
-
-/*!
-    \fn int QMenuBar::midLineWidth() const
-    \internal
-*/
-
 // for private slots
 
 
-- 
2.7.4