diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-07-15 16:21:46 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-07-15 16:23:25 +0200 |
commit | b55c1dd1e16f39a0e8b78571acc3f117c1f18d88 (patch) | |
tree | 03793fa0ccf9b08f0ecba768589b598a85562113 /src/quicktemplates2/qquicktextarea.cpp | |
parent | d9726cbd58fe9329dd450586ae51117f8ac054eb (diff) | |
parent | e9becf6931e9ff12b8912ddb79e4b2cbdd2d530a (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/quicktemplates2/qquickswipedelegate.cpp
tests/auto/controls/data/tst_swipedelegate.qml
tests/auto/controls/data/tst_textarea.qml
tests/auto/controls/data/tst_textfield.qml
Change-Id: I244f4ead4d14238c41db0bd965d7a2938f2ea8fc
Diffstat (limited to 'src/quicktemplates2/qquicktextarea.cpp')
-rw-r--r-- | src/quicktemplates2/qquicktextarea.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquicktextarea.cpp b/src/quicktemplates2/qquicktextarea.cpp index a45a1a6b..754f59f7 100644 --- a/src/quicktemplates2/qquicktextarea.cpp +++ b/src/quicktemplates2/qquicktextarea.cpp @@ -677,6 +677,16 @@ void QQuickTextArea::mouseReleaseEvent(QMouseEvent *event) } } +void QQuickTextArea::mouseDoubleClickEvent(QMouseEvent *event) +{ + Q_D(QQuickTextArea); + if (d->pressHandler.delayedMousePressEvent) { + QQuickTextEdit::mousePressEvent(d->pressHandler.delayedMousePressEvent); + d->pressHandler.clearDelayedMouseEvent(); + } + QQuickTextEdit::mouseDoubleClickEvent(event); +} + void QQuickTextArea::timerEvent(QTimerEvent *event) { Q_D(QQuickTextArea); |