diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-16 15:00:06 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-17 20:49:06 +0200 |
| commit | 714409b23ce5ec33e56adce5ba1966aad67c3b34 (patch) | |
| tree | 83f4655ecfa83f249e85700ce54ca72794d2e544 /src/widgets/widgets/qmenu.h | |
| parent | 30141b2fb7bf3800c0f4374d9adfd23eb40ed275 (diff) | |
Remove deprecated members from QtWidgets/widgets classes
Cleaning up those that are trivial to remove because they have direct
replacements.
The QLabel changes to the pixmap/picture getters provide the following
migration path:
QPixmap *ppix = l->pixmap(); // up to 5.15, warns in 5.15
QPixmap pval = l->pixmap(Qt::ReturnByValue); // new in 5.15, works in 6
QPixmap pixmap = l->pixmap(); // from Qt 6 on
The overload with argument can be deprecated after the first LTS or
so.
Change-Id: I8494ceeea55b2aeda0bd340640ad95cb7c91f7d6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/widgets/widgets/qmenu.h')
| -rw-r--r-- | src/widgets/widgets/qmenu.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/widgets/widgets/qmenu.h b/src/widgets/widgets/qmenu.h index 7a60907532..a163e94c81 100644 --- a/src/widgets/widgets/qmenu.h +++ b/src/widgets/widgets/qmenu.h @@ -288,11 +288,6 @@ private: friend void qt_mac_menu_emit_hovered(QMenu *menu, QAction *action); }; -#ifdef Q_OS_MACOS -// ### Qt 4 compatibility; remove in Qt 6 -inline QT_DEPRECATED void qt_mac_set_dock_menu(QMenu *menu) { menu->setAsDockMenu(); } -#endif - QT_END_NAMESPACE #endif // QMENU_H |