aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2/qquicktooltip.cpp
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2016-07-09 08:25:38 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2016-07-09 08:26:10 +0200
commit1db5df5a73d9cc7dfe24c07ea4f4d30ed377861b (patch)
treeff1d62ff1043a43484d6b069a7bbadfe26a5719f /src/quicktemplates2/qquicktooltip.cpp
parentcbfa64fd84cab95d909371a5e44146928e403c05 (diff)
parent38f7d855f2485cfb6a3a4328c1d31bac44ee0ae0 (diff)
Merge remote-tracking branch 'origin/5.7' into dev
Diffstat (limited to 'src/quicktemplates2/qquicktooltip.cpp')
-rw-r--r--src/quicktemplates2/qquicktooltip.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquicktooltip.cpp b/src/quicktemplates2/qquicktooltip.cpp
index 09c07778..9cc9a0d9 100644
--- a/src/quicktemplates2/qquicktooltip.cpp
+++ b/src/quicktemplates2/qquicktooltip.cpp
@@ -195,6 +195,8 @@ void QQuickToolTip::setText(const QString &text)
This property holds the delay (milliseconds) after which the tool tip is
shown. A tooltip with a negative delay is shown immediately. The default
value is \c 0.
+
+ \sa {Delay and Timeout}
*/
int QQuickToolTip::delay() const
{
@@ -218,6 +220,8 @@ void QQuickToolTip::setDelay(int delay)
This property holds the timeout (milliseconds) after which the tool tip is
hidden. A tooltip with a negative timeout does not hide automatically. The
default value is \c -1.
+
+ \sa {Delay and Timeout}
*/
int QQuickToolTip::timeout() const
{
@@ -346,7 +350,7 @@ QQuickToolTipAttached::QQuickToolTipAttached(QQuickItem *item) :
/*!
\qmlattachedproperty string QtQuick.Controls::ToolTip::text
- This attached property holds the text of the shared tool tip instance.
+ This attached property holds the text of the shared tool tip.
The property can be attached to any item.
*/
QString QQuickToolTipAttached::text() const
@@ -373,6 +377,8 @@ void QQuickToolTipAttached::setText(const QString &text)
This attached property holds the delay (milliseconds) of the shared tool tip.
The property can be attached to any item.
+
+ \sa {Delay and Timeout}
*/
int QQuickToolTipAttached::delay() const
{
@@ -395,6 +401,8 @@ void QQuickToolTipAttached::setDelay(int delay)
This attached property holds the timeout (milliseconds) of the shared tool tip.
The property can be attached to any item.
+
+ \sa {Delay and Timeout}
*/
int QQuickToolTipAttached::timeout() const
{