diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-24 03:03:50 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-24 03:03:51 +0200 |
| commit | 5182f7c5a3190231d1431258ea4cfcd26fbeb2b0 (patch) | |
| tree | 940e9d6d4a59d3e79a50200d34bfd43fa41e93dc /src/quicktemplates2/qquicktooltip.cpp | |
| parent | 0cab878ae937451c8b53262cde7a05e7feaec0a6 (diff) | |
| parent | 6815f353e5a73c0dcf39fbfc91c6a2c1b0784324 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: I34f3fa5e3cd2ebb0ed8f7d4e6d5ed6f66422a48d
Diffstat (limited to 'src/quicktemplates2/qquicktooltip.cpp')
| -rw-r--r-- | src/quicktemplates2/qquicktooltip.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquicktooltip.cpp b/src/quicktemplates2/qquicktooltip.cpp index ddf434a2..c1271dab 100644 --- a/src/quicktemplates2/qquicktooltip.cpp +++ b/src/quicktemplates2/qquicktooltip.cpp @@ -327,10 +327,14 @@ void QQuickToolTip::timerEvent(QTimerEvent *event) if (event->timerId() == d->timeoutTimer.timerId()) { d->stopTimeout(); QQuickPopup::setVisible(false); - } else if (event->timerId() == d->delayTimer.timerId()) { + return; + } + if (event->timerId() == d->delayTimer.timerId()) { d->stopDelay(); QQuickPopup::setVisible(true); + return; } + QQuickPopup::timerEvent(event); } #if QT_CONFIG(accessibility) |