From 16e546e32fec393bc3b126f280114bcbfa7151ff Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Tue, 21 Jul 2020 12:16:09 +0200 Subject: 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. Pick-to: 5.15 Change-Id: Idc1b1b1816673dfdb344d703d101febc823a76ff Reviewed-by: Lars Knoll --- src/corelib/global/qnamespace.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/corelib/global/qnamespace.h') diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 1058acc3a7..cb9b738522 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -81,8 +81,10 @@ namespace Qt { 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, -- cgit v1.2.3