diff options
| author | Milian Wolff <milian.wolff@kdab.com> | 2013-01-28 15:07:18 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-25 15:18:29 +0200 |
| commit | 4ba57a059038f109ae81887be9e903cb8487b6f8 (patch) | |
| tree | 34c427913da6333b220c8827af9f92d9e0296ef0 /src | |
| parent | 57f8fba4cb4eec4794310e5c58e7a27435335560 (diff) | |
Use showNormal() instead of show() in QToolTip.
Even on platforms that use the QPlatformIntegration::StyleHint
ShowIsFullScreen we do not want to show tool tips fullscreen which
would happen if we just call show().
This is also required to fix somewhat random crashes on QNX when
browsing a website and hovering links that would trigger a tooltip to
be shown. There, we could end up with nested calls to
QToolTip::showText when the tooltip was shown full-screen. Since
QToolTip is not reentrant that can lead to crashes since
QTipLabel::instance could be deleted/invalidated inbetween.
Change-Id: I335fcd10cb6d4cffeb622ed8e0caf17f6413d62d
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/widgets/kernel/qtooltip.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/kernel/qtooltip.cpp b/src/widgets/kernel/qtooltip.cpp index 5aea55e196..2b43fd7f6d 100644 --- a/src/widgets/kernel/qtooltip.cpp +++ b/src/widgets/kernel/qtooltip.cpp @@ -512,9 +512,9 @@ void QToolTip::showText(const QPoint &pos, const QString &text, QWidget *w, cons else if (QApplication::isEffectEnabled(Qt::UI_AnimateTooltip)) qScrollEffect(QTipLabel::instance); else - QTipLabel::instance->show(); + QTipLabel::instance->showNormal(); #else - QTipLabel::instance->show(); + QTipLabel::instance->showNormal(); #endif } } |