diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-05-30 19:42:14 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-05-30 19:42:14 +0200 |
| commit | 7d592bcbfb604b1179004e311aa6a972fab6707c (patch) | |
| tree | 92d7ea1e139c3d264dd75dc527c2113e279db9f6 /src/quicktemplates2/qquicktextarea.cpp | |
| parent | f57f2d9e45b177232b76bde07ff96ef3e43fe5b1 (diff) | |
| parent | 44dd55be23138f0a6495b08818acaaa0ff68b086 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/quicktemplates2/qquickrangeslider.cpp
Change-Id: I7eb990cfdc91173f86552841ba16536b35ea09cf
Diffstat (limited to 'src/quicktemplates2/qquicktextarea.cpp')
| -rw-r--r-- | src/quicktemplates2/qquicktextarea.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quicktemplates2/qquicktextarea.cpp b/src/quicktemplates2/qquicktextarea.cpp index 0df65cac..5bcb78af 100644 --- a/src/quicktemplates2/qquicktextarea.cpp +++ b/src/quicktemplates2/qquicktextarea.cpp @@ -110,7 +110,7 @@ QT_BEGIN_NAMESPACE /*! \qmlsignal QtQuick.Controls::TextArea::pressed(MouseEvent event) - \since QtQuick.Controls 2.1 + \since QtQuick.Controls 2.1 (Qt 5.8) This signal is emitted when the text area is pressed by the user. The \l {MouseEvent}{event} parameter provides information about the press, @@ -121,7 +121,7 @@ QT_BEGIN_NAMESPACE /*! \qmlsignal QtQuick.Controls::TextArea::released(MouseEvent event) - \since QtQuick.Controls 2.1 + \since QtQuick.Controls 2.1 (Qt 5.8) This signal is emitted when the text area is released by the user. The \l {MouseEvent}{event} parameter provides information about the release, @@ -560,7 +560,7 @@ void QQuickTextArea::setFocusReason(Qt::FocusReason reason) } /*! - \since QtQuick.Controls 2.1 + \since QtQuick.Controls 2.1 (Qt 5.8) \qmlproperty bool QtQuick.Controls::TextArea::hovered \readonly @@ -593,7 +593,7 @@ void QQuickTextArea::setHovered(bool hovered) } /*! - \since QtQuick.Controls 2.1 + \since QtQuick.Controls 2.1 (Qt 5.8) \qmlproperty bool QtQuick.Controls::TextArea::hoverEnabled This property determines whether the text area accepts hover events. The default value is \c true. |