diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-05-04 13:16:14 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-05-04 13:19:31 +0200 |
| commit | 7f8719e663edae8b08d34cc67cb5000e8402d3d7 (patch) | |
| tree | b098d2c8077a88c2ada577ac874e1416adaf66f7 /src/widgets/util/qsystemtrayicon_x11.cpp | |
| parent | af851c290b7cea22f26bb8c852b0029696469d74 (diff) | |
| parent | eb82959d6688f9e58be4b67670afba3649f1f799 (diff) | |
Merge remote-tracking branch 'origin/5.5' into HEAD
Change-Id: I487a4b7c05687a10c498ac219c31367d4db6fbc0
Diffstat (limited to 'src/widgets/util/qsystemtrayicon_x11.cpp')
| -rw-r--r-- | src/widgets/util/qsystemtrayicon_x11.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/util/qsystemtrayicon_x11.cpp b/src/widgets/util/qsystemtrayicon_x11.cpp index 2752c56c65..9a69db1bc8 100644 --- a/src/widgets/util/qsystemtrayicon_x11.cpp +++ b/src/widgets/util/qsystemtrayicon_x11.cpp @@ -354,7 +354,7 @@ void QSystemTrayIconPrivate::showMessage_sys(const QString &title, const QString } if (!sys) return; - QBalloonTip::showBalloon(icon, message, title, sys->systemTrayIcon(), + QBalloonTip::showBalloon(icon, title, message, sys->systemTrayIcon(), sys->globalGeometry().center(), msecs); } |