Replace Qt's MidButton with MiddleButton

The latter has been the preferred name since Qt 4.7.0.
Added a comment on where the old name is exposed to QML that it's only
for backwards compatibility.

Pick-to: 5.15
Change-Id: I2c5088d597dd7327cc5899d06afb180d0ec2893e
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

5 files changed, 5 insertions, 5 deletions

diff --git a/examples/quick/mousearea/mousearea.qml b/examples/quick/mousearea/mousearea.qml
index cecbc2cfc8..ff792f952d 100644
--- a/examples/quick/mousearea/mousearea.qml
+++ b/examples/quick/mousearea/mousearea.qml
@@ -81,7 +81,7 @@ Rectangle {
                     buttonID = 'LeftButton'
                 else if (mouse.button == Qt.RightButton)
                     buttonID = 'RightButton'
-                else if (mouse.button == Qt.MidButton)
+                else if (mouse.button == Qt.MiddleButton)
                     buttonID = 'MiddleButton'
                 else if (mouse.button == Qt.BackButton)
                     buttonID = 'BackButton'
diff --git a/src/imports/builtins/builtins.qmltypes b/src/imports/builtins/builtins.qmltypes
index 0e6ea66abc..380f1b7176 100644
--- a/src/imports/builtins/builtins.qmltypes
+++ b/src/imports/builtins/builtins.qmltypes
@@ -51,7 +51,7 @@ Module {
                 "NoButton": 0,
                 "LeftButton": 1,
                 "RightButton": 2,
-                "MidButton": 4,
+                "MidButton": 4, // For backwards compatibility
                 "MiddleButton": 4,
                 "BackButton": 8,
                 "XButton1": 8,
diff --git a/src/quick/items/qquicktextcontrol.cpp b/src/quick/items/qquicktextcontrol.cpp
index 6a3b2cb277..06f3e6c40a 100644
--- a/src/quick/items/qquicktextcontrol.cpp
+++ b/src/quick/items/qquicktextcontrol.cpp
@@ -1192,7 +1192,7 @@ void QQuickTextControlPrivate::mouseReleaseEvent(QMouseEvent *e, const QPointF &
 #if QT_CONFIG(clipboard)
         setClipboardSelection();
         selectionChanged(true);
-    } else if (e->button() == Qt::MidButton
+    } else if (e->button() == Qt::MiddleButton
                && (interactionFlags & Qt::TextEditable)
                && QGuiApplication::clipboard()->supportsSelection()) {
         setCursorPosition(pos);
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
index 7917b51c26..db2db9a9d7 100644
--- a/src/quick/items/qquicktextinput.cpp
+++ b/src/quick/items/qquicktextinput.cpp
@@ -1628,7 +1628,7 @@ void QQuickTextInput::mouseReleaseEvent(QMouseEvent *event)
     if (QGuiApplication::clipboard()->supportsSelection()) {
         if (event->button() == Qt::LeftButton) {
             d->copy(QClipboard::Selection);
-        } else if (!d->m_readOnly && event->button() == Qt::MidButton) {
+        } else if (!d->m_readOnly && event->button() == Qt::MiddleButton) {
             d->deselect();
             d->insert(QGuiApplication::clipboard()->text(QClipboard::Selection));
         }
diff --git a/tests/manual/pointer/singlePointHandlerProperties.qml b/tests/manual/pointer/singlePointHandlerProperties.qml
index 71bff2d829..d5c35fff22 100644
--- a/tests/manual/pointer/singlePointHandlerProperties.qml
+++ b/tests/manual/pointer/singlePointHandlerProperties.qml
@@ -126,7 +126,7 @@ Rectangle {
             }
             Image {
                 source: "resources/mouse_middle.png"
-                visible: buttons & Qt.MidButton
+                visible: buttons & Qt.MiddleButton
             }
             Image {
                 source: "resources/mouse_right.png"