summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2020-07-21 12:04:25 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2020-07-22 13:01:06 +0000
commitb610697828e2dc4ce19b6504454938b2dc84419c (patch)
treea8d7d565249bc2aeff6a42aaca84b9641aa606be
parent293397cc577eb8e0805e0ef68f960dbb4574cf24 (diff)
Replace Qt::MidButton with Qt::MiddleButton
The latter has been the preferred name since Qt 4.7.0. (Pick back to 5.15 shall need to drop the test change, as the test was added to dev after it diverged from 5.15.) Change-Id: I3154ea1203e741cb337782d3374e02e15c5f209e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 005a338f169b485077c248358e1cde96d22ae506) Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
-rw-r--r--src/core/web_event_factory.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/web_event_factory.cpp b/src/core/web_event_factory.cpp
index 32d79049d..dd7ed90c7 100644
--- a/src/core/web_event_factory.cpp
+++ b/src/core/web_event_factory.cpp
@@ -1227,7 +1227,7 @@ static WebMouseEvent::Button mouseButtonForEvent(T *event)
return WebMouseEvent::Button::kLeft;
else if (event->button() == Qt::RightButton)
return WebMouseEvent::Button::kRight;
- else if (event->button() == Qt::MidButton)
+ else if (event->button() == Qt::MiddleButton)
return WebMouseEvent::Button::kMiddle;
else if (event->button() == Qt::BackButton)
return WebMouseEvent::Button::kBack;
@@ -1243,7 +1243,7 @@ static WebMouseEvent::Button mouseButtonForEvent(T *event)
return WebMouseEvent::Button::kLeft;
else if (event->buttons() & Qt::RightButton)
return WebMouseEvent::Button::kRight;
- else if (event->buttons() & Qt::MidButton)
+ else if (event->buttons() & Qt::MiddleButton)
return WebMouseEvent::Button::kMiddle;
else if (event->buttons() & Qt::BackButton)
return WebMouseEvent::Button::kBack;
@@ -1261,7 +1261,7 @@ static unsigned mouseButtonsModifiersForEvent(const T* event)
ret |= WebInputEvent::kLeftButtonDown;
if (event->buttons() & Qt::RightButton)
ret |= WebInputEvent::kRightButtonDown;
- if (event->buttons() & Qt::MidButton)
+ if (event->buttons() & Qt::MiddleButton)
ret |= WebInputEvent::kMiddleButtonDown;
if (event->buttons() & Qt::BackButton)
ret |= WebInputEvent::kBackButtonDown;