diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-21 12:09:26 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-22 11:16:08 +0200 |
commit | 3debb37250b2c57aaaf81940f9dfeb540fd4e380 (patch) | |
tree | 2461bf0915f870d66bebaac059a0af734cc399db /src | |
parent | b4d36a05be9f34976c1a1b5ea60ce03c4ab59a25 (diff) |
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>
Diffstat (limited to 'src')
-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 |
3 files changed, 3 insertions, 3 deletions
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)); } |