QMenu/QToolBar: Add overloads of addAction() using Qt 5 signals and slots.

Add documentation dummies and templates, add tests verifying
compilation.

Change-Id: Ide336b28bc069cfd17848ce3a17fd428e36ed65b
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>

2 files changed, 47 insertions, 0 deletions

diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
index 0c06d72026..7e0e752f02 100644
--- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
+++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
@@ -78,6 +78,7 @@ public slots:
 private slots:
     void getSetCheck();
     void addActionsAndClear();
+    void addActionsConnect();
 
     void keyboardNavigation_data();
     void keyboardNavigation();
@@ -264,6 +265,34 @@ void tst_QMenu::addActionsAndClear()
     QCOMPARE(menus[0]->actions().count(), 0);
 }
 
+static void testFunction() { }
+
+void tst_QMenu::addActionsConnect()
+{
+    QMenu menu;
+    const QString text = QLatin1String("bla");
+    const QIcon icon;
+    menu.addAction(text, &menu, SLOT(deleteLater()));
+    menu.addAction(text, &menu, &QMenu::deleteLater);
+    menu.addAction(text, testFunction);
+    menu.addAction(text, &menu, testFunction);
+    menu.addAction(icon, text, &menu, SLOT(deleteLater()));
+    menu.addAction(icon, text, &menu, &QMenu::deleteLater);
+    menu.addAction(icon, text, testFunction);
+    menu.addAction(icon, text, &menu, testFunction);
+#ifndef QT_NO_SHORTCUT
+    const QKeySequence keySequence(Qt::CTRL + Qt::Key_C);
+    menu.addAction(text, &menu, SLOT(deleteLater()), keySequence);
+    menu.addAction(text, &menu, &QMenu::deleteLater, keySequence);
+    menu.addAction(text, testFunction, keySequence);
+    menu.addAction(text, &menu, testFunction, keySequence);
+    menu.addAction(icon, text, &menu, SLOT(deleteLater()), keySequence);
+    menu.addAction(icon, text, &menu, &QMenu::deleteLater, keySequence);
+    menu.addAction(icon, text, testFunction, keySequence);
+    menu.addAction(icon, text, &menu, testFunction, keySequence);
+#endif // !QT_NO_SHORTCUT
+}
+
 // We have a separate mouseActivation test for Windows mobile
 #ifndef Q_OS_WINCE
 void tst_QMenu::mouseActivation()
diff --git a/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp b/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp
index 24de35ce89..642abc3add 100644
--- a/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp
+++ b/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp
@@ -67,6 +67,7 @@ private slots:
     void allowedAreas();
     void orientation();
     void addAction();
+    void addActionConnect();
     void insertAction();
     void addSeparator();
     void insertSeparator();
@@ -361,6 +362,23 @@ void tst_QToolBar::addAction()
     }
 }
 
+static void testFunction() { }
+
+void tst_QToolBar::addActionConnect()
+{
+    QToolBar tb;
+    const QString text = QLatin1String("bla");
+    const QIcon icon;
+    tb.addAction(text, &tb, SLOT(deleteLater()));
+    tb.addAction(text, &tb, &QMenu::deleteLater);
+    tb.addAction(text, testFunction);
+    tb.addAction(text, &tb, testFunction);
+    tb.addAction(icon, text, &tb, SLOT(deleteLater()));
+    tb.addAction(icon, text, &tb, &QMenu::deleteLater);
+    tb.addAction(icon, text, testFunction);
+    tb.addAction(icon, text, &tb, testFunction);
+}
+
 void tst_QToolBar::insertAction()
 {
     QToolBar tb;