diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-21 12:16:09 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-08-22 22:05:34 +0000 |
| commit | 6ee6c52b57a0fbe9df00b30616afd90476ebdfd6 (patch) | |
| tree | dba86c63dd24a9fafc3999f08c6c2d8b141143dd /src/corelib/global | |
| parent | b856b83838947da16664b4fbfa32f76eb01fbca6 (diff) | |
Properly deprecate Qt::MidButton in favor of Qt::MiddleButton
MidButton had its // ### Qt 5: remove me
upgraded to Qt 6 at 5.0; but it dates back to 4.7.0
Replace the many remaining uses of MidButton with MiddleButton in the
process.
Change-Id: Idc1b1b1816673dfdb344d703d101febc823a76ff
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 16e546e32fec393bc3b126f280114bcbfa7151ff)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qnamespace.h | 6 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index b745d0de7e..d98ece7e7f 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -127,8 +127,10 @@ public: NoButton = 0x00000000, LeftButton = 0x00000001, RightButton = 0x00000002, - MidButton = 0x00000004, // ### Qt 6: remove me - MiddleButton = MidButton, + MiddleButton = 0x00000004, +#if QT_DEPRECATED_SINCE(5, 15) // commented as such since 4.7.0 + MidButton Q_DECL_ENUMERATOR_DEPRECATED_X("MidButton is deprecated. Use MiddleButton instead") = MiddleButton, +#endif BackButton = 0x00000008, XButton1 = BackButton, ExtraButton1 = XButton1, diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index dc49d87cf3..309265bb49 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -338,8 +338,8 @@ to the left button. (The left button may be the right button on left-handed mice.) \value RightButton The right button. - \value MidButton The middle button. \value MiddleButton The middle button. + \omitvalue MidButton \value BackButton The 'Back' button. (Typically present on the 'thumb' side of a mouse with extra buttons. This is NOT |