diff options
| -rw-r--r-- | examples/quick/mousearea/mousearea.qml | 2 | ||||
| -rw-r--r-- | src/imports/builtins/builtins.qmltypes | 2 | ||||
| -rw-r--r-- | src/quick/items/qquicktextcontrol.cpp | 2 | ||||
| -rw-r--r-- | src/quick/items/qquicktextinput.cpp | 2 | ||||
| -rw-r--r-- | tests/manual/pointer/singlePointHandlerProperties.qml | 2 |
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 765c92fcb9..a854390f37 100644 --- a/src/imports/builtins/builtins.qmltypes +++ b/src/imports/builtins/builtins.qmltypes @@ -54,7 +54,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 4c741f67e3..8db2a38b11 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 06a9f134ac..6275b298ed 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -1629,7 +1629,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" |