mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-05 13:37:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Restrict Q_OS_UNIX ifdefs to non-Mac platforms

Browse source
This commit is contained in:
Janek Bevendorff 2017-12-27 20:31:15 +01:00
parent e29d3497eb
commit 71f38f17cd
3 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/gui/MainWindow.cpp
View file

@ -23,7 +23,7 @@
#include <QShortcut>
#include <QTimer>
#if defined(Q_OS_UNIX) && !defined(QT_NO_DBUS)
#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(QT_NO_DBUS)
#include <QList>
#include <QtDBus/QtDBus>
#endif
@ -888,7 +888,7 @@ void MainWindow::toggleWindow()
raise();
activateWindow();
#if defined(Q_OS_UNIX) && !defined(QT_NO_DBUS) && (QT_VERSION < QT_VERSION_CHECK(5, 9, 0))
#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !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