Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2026-01-10 13:01:24 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'release/2.2.3' into develop

Browse source
This commit is contained in:
Janek Bevendorff 2017-10-24 18:00:38 +02:00
commit be88e93820
No known key found for this signature in database
GPG key ID: 2FDEB0D40BCA5E11
5 changed files with 68 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/gui/MainWindow.cpp
View file

@ -884,7 +884,7 @@ void MainWindow::toggleWindow()
raise();
activateWindow();
#if defined(Q_OS_LINUX) && ! defined(QT_NO_DBUS)
#if defined(Q_OS_LINUX) && ! defined(QT_NO_DBUS) && (QT_VERSION < QT_VERSION_CHECK(5, 9, 0))
// re-register global D-Bus menu (needed on Ubuntu with Unity)
// see https://github.com/keepassxreboot/keepassxc/issues/271
// and https://bugreports.qt.io/browse/QTBUG-58723