mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-06 14:07:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

s/Q_OS_LINUX/Q_OS_UNIX/g

Browse source 
Enable support for UNIX like OS.
This commit is contained in:
Rafael Sadowski 2017-10-03 09:47:33 +02:00 • committed by Janek Bevendorff
parent 8f4c2f5c58
commit e29d3497eb
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core/ScreenLockListenerPrivate.cpp
View file

@ -19,7 +19,7 @@
#if defined(Q_OS_OSX) #if defined(Q_OS_OSX)
#include "ScreenLockListenerMac.h" #include "ScreenLockListenerMac.h"
#endif #endif
#if defined(Q_OS_LINUX) #if defined(Q_OS_UNIX)
#include "ScreenLockListenerDBus.h" #include "ScreenLockListenerDBus.h"
#endif #endif
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
@ -36,7 +36,7 @@ ScreenLockListenerPrivate* ScreenLockListenerPrivate::instance(QWidget* parent)
#if defined(Q_OS_OSX) #if defined(Q_OS_OSX)
Q_UNUSED(parent); Q_UNUSED(parent);
return ScreenLockListenerMac::instance(); return ScreenLockListenerMac::instance();
#elif defined(Q_OS_LINUX) #elif defined(Q_OS_UNIX)
return new ScreenLockListenerDBus(parent); return new ScreenLockListenerDBus(parent);
#elif defined(Q_OS_WIN) #elif defined(Q_OS_WIN)
return new ScreenLockListenerWin(parent); return new ScreenLockListenerWin(parent);

4
src/gui/MainWindow.cpp
View file

@ -23,7 +23,7 @@
#include <QShortcut> #include <QShortcut>
#include <QTimer> #include <QTimer>
#if defined(Q_OS_LINUX) && ! defined(QT_NO_DBUS) #if defined(Q_OS_UNIX) && !defined(QT_NO_DBUS)
#include <QList> #include <QList>
#include <QtDBus/QtDBus> #include <QtDBus/QtDBus>
#endif #endif
@ -888,7 +888,7 @@ void MainWindow::toggleWindow()
raise(); raise();
activateWindow(); 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) // re-register global D-Bus menu (needed on Ubuntu with Unity)
// see https://github.com/keepassxreboot/keepassxc/issues/271 // see https://github.com/keepassxreboot/keepassxc/issues/271
// and https://bugreports.qt.io/browse/QTBUG-58723 // and https://bugreports.qt.io/browse/QTBUG-58723

2
src/main.cpp
View file

@ -39,7 +39,7 @@
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin) Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
#elif Q_OS_LINUX #elif Q_OS_UNIX
Q_IMPORT_PLUGIN(QXcbIntegrationPlugin) Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)
#endif #endif
#endif #endif