diff options
| author | Ilya Kotov <forkotov02@hotmail.ru> | 2015-11-22 13:05:38 +0300 |
|---|---|---|
| committer | Ilya Kotov <forkotov02@hotmail.ru> | 2015-11-26 15:48:34 +0000 |
| commit | acc3df2c4e65fac822fc0f69d9849f1996130741 (patch) | |
| tree | 390e7df7631e3ca6829290178abc7517fe55f704 /src/widgets/util | |
| parent | 07fdfa559844403d0836ab0783f201b50a9961af (diff) | |
Send QEvent::Tooltip to QSystemTrayIcon
QSystemTrayIcon's window should send QEvent::ToolTip to QSystemTrayIcon
main class under X11. This patch fixes regression inroduced in Qt 5.0.
Change-Id: I81f6d85e13f492e5e7d13dacc44185a511e5085d
Task-number: QTBUG-46130
Reviewed-by: Błażej Szczygieł <spaz16@wp.pl>
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Diffstat (limited to 'src/widgets/util')
| -rw-r--r-- | src/widgets/util/qsystemtrayicon.cpp | 6 | ||||
| -rw-r--r-- | src/widgets/util/qsystemtrayicon_x11.cpp | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/widgets/util/qsystemtrayicon.cpp b/src/widgets/util/qsystemtrayicon.cpp index d22791048f..31bbbb9739 100644 --- a/src/widgets/util/qsystemtrayicon.cpp +++ b/src/widgets/util/qsystemtrayicon.cpp @@ -284,12 +284,6 @@ bool QSystemTrayIcon::isVisible() const */ bool QSystemTrayIcon::event(QEvent *e) { -#if defined(Q_DEAD_CODE_FROM_QT4_X11) - if (e->type() == QEvent::ToolTip) { - Q_D(QSystemTrayIcon); - return d->sys->deliverToolTipEvent(e); - } -#endif return QObject::event(e); } diff --git a/src/widgets/util/qsystemtrayicon_x11.cpp b/src/widgets/util/qsystemtrayicon_x11.cpp index 9a69db1bc8..02bab236c8 100644 --- a/src/widgets/util/qsystemtrayicon_x11.cpp +++ b/src/widgets/util/qsystemtrayicon_x11.cpp @@ -194,6 +194,9 @@ void QSystemTrayIconSys::mouseDoubleClickEvent(QMouseEvent *ev) bool QSystemTrayIconSys::event(QEvent *e) { switch (e->type()) { + case QEvent::ToolTip: + QApplication::sendEvent(q, e); + break; #ifndef QT_NO_WHEELEVENT case QEvent::Wheel: return QApplication::sendEvent(q, e); |