diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-08-17 19:30:25 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-08-19 14:39:39 +0000 |
commit | 449a655fd7c1b049ea2cc57033987a2556aadcd8 (patch) | |
tree | 5cc169fd4171b4e4580baa7dd4644a9e7b87a411 /src | |
parent | 62646977131f0bd591d9a0dc077f44386f10ad17 (diff) |
Fix attached ToolTip properties
The attached properties should apply to the shared/global tooltip
instance only when the shared tooltip is visible for the attachee
item.
Task-number: QTBUG-55347
Change-Id: Ia822f2d1de62d2d6dfb28519817edce674d8c2b8
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/quicktemplates2/qquicktooltip.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquicktooltip.cpp b/src/quicktemplates2/qquicktooltip.cpp index 65e81fda..d47589ba 100644 --- a/src/quicktemplates2/qquicktooltip.cpp +++ b/src/quicktemplates2/qquicktooltip.cpp @@ -379,8 +379,8 @@ void QQuickToolTipAttached::setText(const QString &text) d->text = text; emit textChanged(); - if (QQuickToolTip *tip = d->instance(true)) - tip->setText(text); + if (isVisible()) + d->instance(true)->setText(text); } /*! @@ -405,6 +405,9 @@ void QQuickToolTipAttached::setDelay(int delay) d->delay = delay; emit delayChanged(); + + if (isVisible()) + d->instance(true)->setDelay(delay); } /*! @@ -429,6 +432,9 @@ void QQuickToolTipAttached::setTimeout(int timeout) d->timeout = timeout; emit timeoutChanged(); + + if (isVisible()) + d->instance(true)->setTimeout(timeout); } /*! |