diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-11 17:17:13 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-11 17:17:51 +0200 |
| commit | 4dac45c9ee59ff6586d90d423654da91523ab679 (patch) | |
| tree | cd4a4adf2cbc9e77bf86d2d11e71ec66afdf3be4 /src/widgets/util/qsystemtrayicon_x11.cpp | |
| parent | 078cd61751aeaa310d35a3d596a21a36004a1a0f (diff) | |
| parent | f44850b5c3464cdda0ee9b1ee858d95f3ffaa3e2 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I715b1d743d5f11560e7b3fbeb8fd64a5e5ddb277
Diffstat (limited to 'src/widgets/util/qsystemtrayicon_x11.cpp')
| -rw-r--r-- | src/widgets/util/qsystemtrayicon_x11.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/util/qsystemtrayicon_x11.cpp b/src/widgets/util/qsystemtrayicon_x11.cpp index 70e5f3678e..0c7bb94a91 100644 --- a/src/widgets/util/qsystemtrayicon_x11.cpp +++ b/src/widgets/util/qsystemtrayicon_x11.cpp @@ -151,11 +151,11 @@ bool QSystemTrayIconSys::event(QEvent *e) { switch (e->type()) { case QEvent::ToolTip: - QApplication::sendEvent(q, e); + QCoreApplication::sendEvent(q, e); break; #if QT_CONFIG(wheelevent) case QEvent::Wheel: - return QApplication::sendEvent(q, e); + return QCoreApplication::sendEvent(q, e); #endif default: break; |