diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2021-07-08 16:27:52 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2021-07-13 19:58:08 +0200 |
| commit | 09d1196281ccd03dac55781ac91f6c4eb7bb4de9 (patch) | |
| tree | b2c21360c48a8a2c513efa8fd3a91aae1359e531 /tests/auto/widgets/widgets | |
| parent | 08e4d2db084f6abbf1840ffb694b15bd215ad069 (diff) | |
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>
Diffstat (limited to 'tests/auto/widgets/widgets')
| -rw-r--r-- | tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp index 1ca51cd1a9..55345f2ae5 100644 --- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp +++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp @@ -304,6 +304,9 @@ void tst_QMenu::addActionsConnect() menu.addAction(icon, text, &menu, testFunction); #ifndef QT_NO_SHORTCUT const QKeySequence keySequence(Qt::CTRL | Qt::Key_C); +#if QT_DEPRECATED_SINCE(6, 4) + QT_WARNING_PUSH + QT_WARNING_DISABLE_DEPRECATED menu.addAction(text, &menu, SLOT(deleteLater()), keySequence); menu.addAction(text, &menu, &QMenu::deleteLater, keySequence); menu.addAction(text, testFunction, keySequence); @@ -312,6 +315,16 @@ void tst_QMenu::addActionsConnect() menu.addAction(icon, text, &menu, &QMenu::deleteLater, keySequence); menu.addAction(icon, text, testFunction, keySequence); menu.addAction(icon, text, &menu, testFunction, keySequence); + QT_WARNING_POP +#endif + menu.addAction(text, keySequence, &menu, SLOT(deleteLater())); + menu.addAction(text, keySequence, &menu, &QMenu::deleteLater); + menu.addAction(text, keySequence, testFunction); + menu.addAction(text, keySequence, &menu, testFunction); + menu.addAction(icon, text, keySequence, &menu, SLOT(deleteLater())); + menu.addAction(icon, text, keySequence, &menu, &QMenu::deleteLater); + menu.addAction(icon, text, keySequence, testFunction); + menu.addAction(icon, text, keySequence, &menu, testFunction); #endif // !QT_NO_SHORTCUT } |