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/xcb/qxcbconnection.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/xcb/qxcbconnection.cpp')
-rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp index 1478e58ccc..a703a46cf8 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection.cpp @@ -459,7 +459,7 @@ static Qt::MouseButtons translateMouseButtons(int s) if (s & XCB_BUTTON_MASK_1) ret |= Qt::LeftButton; if (s & XCB_BUTTON_MASK_2) - ret |= Qt::MidButton; + ret |= Qt::MiddleButton; if (s & XCB_BUTTON_MASK_3) ret |= Qt::RightButton; return ret; @@ -475,7 +475,7 @@ Qt::MouseButton QXcbConnection::translateMouseButton(xcb_button_t s) { switch (s) { case 1: return Qt::LeftButton; - case 2: return Qt::MidButton; + case 2: return Qt::MiddleButton; case 3: return Qt::RightButton; // Button values 4-7 were already handled as Wheel events, and won't occur here. case 8: return Qt::BackButton; // Also known as Qt::ExtraButton1 |