diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-21 12:16:09 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-08-22 21:47:36 +0200 |
commit | 16e546e32fec393bc3b126f280114bcbfa7151ff (patch) | |
tree | 0d8d1f88fdd29ba5a28c3a5039bd7f6e6b76727c /src/plugins/platforms/windows/qwindowsmousehandler.cpp | |
parent | 4b1ffab8ad95eda737fde015c243442a28de8e23 (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.
Pick-to: 5.15
Change-Id: Idc1b1b1816673dfdb344d703d101febc823a76ff
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsmousehandler.cpp')
-rw-r--r-- | src/plugins/platforms/windows/qwindowsmousehandler.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/platforms/windows/qwindowsmousehandler.cpp b/src/plugins/platforms/windows/qwindowsmousehandler.cpp index 5e2710bc28..02c59d4d27 100644 --- a/src/plugins/platforms/windows/qwindowsmousehandler.cpp +++ b/src/plugins/platforms/windows/qwindowsmousehandler.cpp @@ -143,7 +143,7 @@ Qt::MouseButtons QWindowsMouseHandler::queryMouseButtons() if (GetAsyncKeyState(VK_RBUTTON) < 0) result |= mouseSwapped ? Qt::LeftButton : Qt::RightButton; if (GetAsyncKeyState(VK_MBUTTON) < 0) - result |= Qt::MidButton; + result |= Qt::MiddleButton; if (GetAsyncKeyState(VK_XBUTTON1) < 0) result |= Qt::XButton1; if (GetAsyncKeyState(VK_XBUTTON2) < 0) @@ -187,11 +187,11 @@ static inline MouseEvent eventFromMsg(const MSG &msg) case WM_LBUTTONDBLCLK: // Qt QPA does not handle double clicks, send as press return {QEvent::MouseButtonPress, Qt::LeftButton}; case WM_MBUTTONDOWN: - return {QEvent::MouseButtonPress, Qt::MidButton}; + return {QEvent::MouseButtonPress, Qt::MiddleButton}; case WM_MBUTTONUP: - return {QEvent::MouseButtonRelease, Qt::MidButton}; + return {QEvent::MouseButtonRelease, Qt::MiddleButton}; case WM_MBUTTONDBLCLK: - return {QEvent::MouseButtonPress, Qt::MidButton}; + return {QEvent::MouseButtonPress, Qt::MiddleButton}; case WM_RBUTTONDOWN: return {QEvent::MouseButtonPress, Qt::RightButton}; case WM_RBUTTONUP: @@ -213,11 +213,11 @@ static inline MouseEvent eventFromMsg(const MSG &msg) case WM_NCLBUTTONDBLCLK: return {QEvent::NonClientAreaMouseButtonPress, Qt::LeftButton}; case WM_NCMBUTTONDOWN: - return {QEvent::NonClientAreaMouseButtonPress, Qt::MidButton}; + return {QEvent::NonClientAreaMouseButtonPress, Qt::MiddleButton}; case WM_NCMBUTTONUP: - return {QEvent::NonClientAreaMouseButtonRelease, Qt::MidButton}; + return {QEvent::NonClientAreaMouseButtonRelease, Qt::MiddleButton}; case WM_NCMBUTTONDBLCLK: - return {QEvent::NonClientAreaMouseButtonPress, Qt::MidButton}; + return {QEvent::NonClientAreaMouseButtonPress, Qt::MiddleButton}; case WM_NCRBUTTONDOWN: return {QEvent::NonClientAreaMouseButtonPress, Qt::RightButton}; case WM_NCRBUTTONUP: |