diff --git a/src/core/ScreenLockListenerPrivate.cpp b/src/core/ScreenLockListenerPrivate.cpp index 36ee301f2..e1e6f3ae6 100644 --- a/src/core/ScreenLockListenerPrivate.cpp +++ b/src/core/ScreenLockListenerPrivate.cpp @@ -19,7 +19,7 @@ #if defined(Q_OS_OSX) #include "ScreenLockListenerMac.h" #endif -#if defined(Q_OS_LINUX) +#if defined(Q_OS_UNIX) #include "ScreenLockListenerDBus.h" #endif #if defined(Q_OS_WIN) @@ -36,7 +36,7 @@ ScreenLockListenerPrivate* ScreenLockListenerPrivate::instance(QWidget* parent) #if defined(Q_OS_OSX) Q_UNUSED(parent); return ScreenLockListenerMac::instance(); -#elif defined(Q_OS_LINUX) +#elif defined(Q_OS_UNIX) return new ScreenLockListenerDBus(parent); #elif defined(Q_OS_WIN) return new ScreenLockListenerWin(parent); diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index d63545bf1..e21c9dd64 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -23,7 +23,7 @@ #include #include -#if defined(Q_OS_LINUX) && ! defined(QT_NO_DBUS) +#if defined(Q_OS_UNIX) && !defined(QT_NO_DBUS) #include #include #endif @@ -888,7 +888,7 @@ void MainWindow::toggleWindow() raise(); activateWindow(); -#if defined(Q_OS_LINUX) && ! defined(QT_NO_DBUS) && (QT_VERSION < QT_VERSION_CHECK(5, 9, 0)) +#if defined(Q_OS_UNIX) && !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 diff --git a/src/main.cpp b/src/main.cpp index 7977435fc..90fb68762 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -39,7 +39,7 @@ #ifdef Q_OS_WIN Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin) -#elif Q_OS_LINUX +#elif Q_OS_UNIX Q_IMPORT_PLUGIN(QXcbIntegrationPlugin) #endif #endif