6 files changed, 1 insertions, 73 deletions
diff --git a/src/widgets/widgets/qabstractspinbox.cpp b/src/widgets/widgets/qabstractspinbox.cpp
index 25e2fc0eeb..73bf22ee26 100644
--- a/src/widgets/widgets/qabstractspinbox.cpp
+++ b/src/widgets/widgets/qabstractspinbox.cpp
@@ -1156,19 +1156,6 @@ void QAbstractSpinBox::hideEvent(QHideEvent *event)
 
 
 /*!
-    \internal
-
-    Used when acceleration is turned on. We need to get the
-    keyboard auto repeat rate from OS. This value is used as
-    argument when starting acceleration related timers.
-
-    Every platform should, either, use native calls to obtain
-    the value or hard code some reasonable rate.
-
-    Remember that time value should be given in msecs.
-*/
-
-/*!
     \reimp
 */
 
diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp
index 34fe924245..ead1dfa6e3 100644
--- a/src/widgets/widgets/qcalendarwidget.cpp
+++ b/src/widgets/widgets/qcalendarwidget.cpp
@@ -2949,17 +2949,6 @@ void QCalendarWidget::updateCells()
 */
 
 /*!
-    \property QCalendarWidget::headerVisible
-    \brief whether the navigation bar is shown or not
-
-    \obsolete
-
-    Use navigationBarVisible() instead.
-
-    By default, this property is true.
-*/
-
-/*!
     \property QCalendarWidget::navigationBarVisible
     \brief whether the navigation bar is shown or not
 
diff --git a/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm b/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm
index 3aff6ee5d9..c0a46e9568 100644
--- a/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm
+++ b/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm
@@ -85,7 +85,7 @@
     developer to provide the autorelease pool.
 
     The following is a snippet of subclassing QMacCocoaViewContainer to wrap a NSSearchField.
-    \snippet mainwindows/macmainwindow/macmainwindow.mm 0
+    \snippet widgets/mainwindows/macmainwindow/macmainwindow.mm 0
 
 */
 
diff --git a/src/widgets/widgets/qpushbutton.cpp b/src/widgets/widgets/qpushbutton.cpp
index 9853924182..1c2181732e 100644
--- a/src/widgets/widgets/qpushbutton.cpp
+++ b/src/widgets/widgets/qpushbutton.cpp
@@ -718,30 +718,6 @@ bool QPushButtonPrivate::hitButton(const QPoint &pos)
 #endif // Q_WS_MAC
 
 
-/*!
-    \fn void QPushButton::openPopup()
-
-    Use showMenu() instead.
-*/
-
-/*!
-    \fn bool QPushButton::isMenuButton() const
-
-    Use menu() != 0 instead.
-*/
-
-/*!
-    \fn void QPushButton::setPopup(QMenu* popup)
-
-    Use setMenu() instead.
-*/
-
-/*!
-    \fn QMenu* QPushButton::popup() const
-
-    Use menu() instead.
-*/
-
 QT_END_NAMESPACE
 
 #include "moc_qpushbutton.cpp"
diff --git a/src/widgets/widgets/qstatusbar.cpp b/src/widgets/widgets/qstatusbar.cpp
index 42eb054365..ecbd43271c 100644
--- a/src/widgets/widgets/qstatusbar.cpp
+++ b/src/widgets/widgets/qstatusbar.cpp
@@ -599,18 +599,6 @@ QString QStatusBar::currentMessage() const
 }
 
 /*!
-    \fn void QStatusBar::message(const QString &message, int timeout)
-
-    Use the showMessage() function instead.
-*/
-
-/*!
-    \fn void QStatusBar::clear()
-
-    Use the clearMessage() function instead.
-*/
-
-/*!
     \fn QStatusBar::messageChanged(const QString &message)
 
     This signal is emitted whenever the temporary status message
diff --git a/src/widgets/widgets/qtoolbar.cpp b/src/widgets/widgets/qtoolbar.cpp
index b2587e64dd..2d3899ab0c 100644
--- a/src/widgets/widgets/qtoolbar.cpp
+++ b/src/widgets/widgets/qtoolbar.cpp
@@ -1214,18 +1214,6 @@ QAction *QToolBar::toggleViewAction() const
 { Q_D(const QToolBar); return d->toggleViewAction; }
 
 /*!
-    \fn void QToolBar::setLabel(const QString &label)
-
-    Use setWindowTitle() instead.
-*/
-
-/*!
-    \fn QString QToolBar::label() const
-
-    Use windowTitle() instead.
-*/
-
-/*!
     \since 4.2
 
     Returns the widget associated with the specified \a action.