diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-30 03:04:24 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-30 03:04:24 +0100 |
commit | 9a9ae6be7d278cdcaf6ac99ea22b3d6cf1093313 (patch) | |
tree | 616c31b355cd94fd53749fec87cd87df3cfeb1a5 /src/quicktemplates2/qquicktextarea.cpp | |
parent | 80f1186338bcf8c7d692b4fadfc46531c002c6b0 (diff) | |
parent | 8ee511bcd9f1376e9995ab3f30f6415ad60b7c05 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Icb923b10d2b6c524ebaa8b38c7979b780e3582d4
Diffstat (limited to 'src/quicktemplates2/qquicktextarea.cpp')
-rw-r--r-- | src/quicktemplates2/qquicktextarea.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/quicktemplates2/qquicktextarea.cpp b/src/quicktemplates2/qquicktextarea.cpp index ef452fd07a..56dc946d62 100644 --- a/src/quicktemplates2/qquicktextarea.cpp +++ b/src/quicktemplates2/qquicktextarea.cpp @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype TextArea \inherits TextEdit - \instantiates QQuickTextArea +//! \instantiates QQuickTextArea \inqmlmodule QtQuick.Controls \since 5.7 \ingroup qtquickcontrols2-input @@ -121,8 +121,8 @@ QT_BEGIN_NAMESPACE \qmlsignal QtQuick.Controls::TextArea::pressAndHold(MouseEvent event) This signal is emitted when there is a long press (the delay depends on the platform plugin). - The \l {MouseEvent}{event} parameter provides information about the press, including the x and y - position of the press, and which button is pressed. + The \a event parameter provides information about the press, including the x and y + coordinates of the press, and which button is pressed. \sa pressed, released */ @@ -132,8 +132,8 @@ QT_BEGIN_NAMESPACE \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, - including the x and y position of the press, and which button is pressed. + The \a event parameter provides information about the press, + including the x and y coordinates of the press, and which button is pressed. \sa released, pressAndHold */ @@ -143,8 +143,9 @@ QT_BEGIN_NAMESPACE \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, - including the x and y position of the press, and which button is pressed. + The \a event parameter provides information about the release, + including the x and y coordinates of the press, and which button + is pressed. \sa pressed, pressAndHold */ |