diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-11-06 14:02:21 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-11-06 14:02:21 +0100 |
commit | c39b126a77e27296ef82a1634753c775cc5a93fb (patch) | |
tree | 235d9568e21e59b7c70f8be81518c3ea184cf552 /src/quicktemplates2/qquicktextarea.cpp | |
parent | dc2603562a36241c9beac0c9c4c08bcbfed7b6a2 (diff) | |
parent | 430fe83ecb7106118cbebd735637aee9e9253914 (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/quicktemplates2/qquickabstractbutton_p.h
src/quicktemplates2/qquickbuttongroup_p.h
src/quicktemplates2/qquickrangeslider.cpp
src/quicktemplates2/qquickrangeslider_p.h
src/quicktemplates2/qquickswipeview_p.h
src/quicktemplates2/qquicktextarea.cpp
src/quicktemplates2/qquicktextarea_p.h
src/quicktemplates2/qquicktextfield_p.h
Change-Id: I7cba8783b1dd85a4db534222e36572ee05dd01d0
Diffstat (limited to 'src/quicktemplates2/qquicktextarea.cpp')
-rw-r--r-- | src/quicktemplates2/qquicktextarea.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/quicktemplates2/qquicktextarea.cpp b/src/quicktemplates2/qquicktextarea.cpp index 19ede665..02e84a35 100644 --- a/src/quicktemplates2/qquicktextarea.cpp +++ b/src/quicktemplates2/qquicktextarea.cpp @@ -559,6 +559,14 @@ void QQuickTextArea::setFocusReason(Qt::FocusReason reason) emit focusReasonChanged(); } +bool QQuickTextArea::contains(const QPointF &point) const +{ + Q_D(const QQuickTextArea); + if (d->flickable && !d->flickable->contains(d->flickable->mapFromItem(this, point))) + return false; + return QQuickTextEdit::contains(point); +} + /*! \since QtQuick.Controls 2.1 (Qt 5.8) \qmlproperty bool QtQuick.Controls::TextArea::hovered @@ -635,14 +643,6 @@ void QQuickTextArea::resetHoverEnabled() #endif } -bool QQuickTextArea::contains(const QPointF &point) const -{ - Q_D(const QQuickTextArea); - if (d->flickable && !d->flickable->contains(d->flickable->mapFromItem(this, point))) - return false; - return QQuickTextEdit::contains(point); -} - /*! \since QtQuick.Controls 2.3 (Qt 5.10) \qmlproperty palette QtQuick.Controls::TextArea::palette |