QMenu/QToolBar: remove addAction() functions

They're now in QWidget itself. Remove them from the API, but not the
ABI.

The QToolBar case is straight-forward. QMenu is a bit more complicated:

Since QT_CONFIG(shortcut) builds changed the signature of an existing
function instead of adding/removing an overload, we have to deal with
two cases: In a QT_CONFIG(shortcut) build, these overloads that take a
trailing QKeySequence parameter have been deprecated and therefore
cannot be removed. In a !QT_CONFIG(shortcut) build, the same functions
are 1:1 copies of QWidget functions and can be removed (from the API).

[ChangeLog][QtWidgets][QMenu/QToolBar] The addAction() functions have
been moved down into QWidget.

Change-Id: I49997b3440c137a1d4e3858d1d27d34a191e1eed
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>

1 files changed, 0 insertions, 111 deletions

diff --git a/src/widgets/widgets/qtoolbar.cpp b/src/widgets/widgets/qtoolbar.cpp
index e69c08a251..169fbf5de8 100644
--- a/src/widgets/widgets/qtoolbar.cpp
+++ b/src/widgets/widgets/qtoolbar.cpp
@@ -737,117 +737,6 @@ void QToolBar::clear()
 }
 
 /*!
-    Creates a new action with the given \a text. This action is added to
-    the end of the toolbar.
-*/
-QAction *QToolBar::addAction(const QString &text)
-{
-    QAction *action = new QAction(text, this);
-    addAction(action);
-    return action;
-}
-
-/*!
-    \overload
-
-    Creates a new action with the given \a icon and \a text. This
-    action is added to the end of the toolbar.
-*/
-QAction *QToolBar::addAction(const QIcon &icon, const QString &text)
-{
-    QAction *action = new QAction(icon, text, this);
-    addAction(action);
-    return action;
-}
-
-/*!
-    \overload
-
-    Creates a new action with the given \a text. This action is added to
-    the end of the toolbar. The action's \l{QAction::triggered()}{triggered()}
-    signal is connected to \a member in \a receiver.
-*/
-QAction *QToolBar::addAction(const QString &text,
-                             const QObject *receiver, const char* member)
-{
-    QAction *action = new QAction(text, this);
-    QObject::connect(action, SIGNAL(triggered(bool)), receiver, member);
-    addAction(action);
-    return action;
-}
-
-/*!
-    \overload
-
-    Creates a new action with the given \a icon and \a text. This
-    action is added to the end of the toolbar. The action's
-    \l{QAction::triggered()}{triggered()} signal is connected to \a
-    member in \a receiver.
-*/
-QAction *QToolBar::addAction(const QIcon &icon, const QString &text,
-                             const QObject *receiver, const char* member)
-{
-    QAction *action = new QAction(icon, text, this);
-    QObject::connect(action, SIGNAL(triggered(bool)), receiver, member);
-    addAction(action);
-    return action;
-}
-
-/*!\fn template<typename Functor> QAction *QToolBar::addAction(const QString &text, Functor functor)
-
-    \since 5.6
-
-    \overload
-
-    Creates a new action with the given \a text. This action is added to
-    the end of the toolbar. The action's
-    \l{QAction::triggered()}{triggered()} signal is connected to the
-    \a functor.
-*/
-
-/*!\fn template<typename Functor> QAction *QToolBar::addAction(const QString &text, const QObject *context, Functor functor)
-
-    \since 5.6
-
-    \overload
-
-    Creates a new action with the given \a text. This action is added
-    to the end of the toolbar. The action's
-    \l{QAction::triggered()}{triggered()} signal is connected to the
-    \a functor. The \a functor can be a pointer to a member function
-    in the \a context object.
-
-    If the \a context object is destroyed, the \a functor will not be called.
-*/
-
-/*!\fn template<typename Functor> QAction *QToolBar::addAction(const QIcon &icon, const QString &text, Functor functor)
-
-    \since 5.6
-
-    \overload
-
-    Creates a new action with the given \a icon and \a text. This
-    action is added to the end of the toolbar. The action's
-    \l{QAction::triggered()}{triggered()} signal is connected to the
-    \a functor.
-*/
-
-/*!\fn template<typename Functor> QAction *QToolBar::addAction(const QIcon &icon, const QString &text, const QObject *context, Functor functor)
-
-    \since 5.6
-
-    \overload
-
-    Creates a new action with the given \a icon and \a text. This
-    action is added to the end of the toolbar. The action's
-    \l{QAction::triggered()}{triggered()} signal is connected to the
-    \a functor. The \a functor can be a pointer to a member function
-    of the \a context object.
-
-    If the \a context object is destroyed, the \a functor will not be called.
-*/
-
-/*!
      Adds a separator to the end of the toolbar.
 
      \sa insertSeparator()