Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-06-29 08:57:43 -04:00
Code Issues Projects Releases Packages Wiki Activity

Use Q_OS_MAC instead of the nonexistent Q_OS_MACOS.

Browse source 
Thanks to Richard Johnson for spotting this.

Closes #33
This commit is contained in:
Felix Geyer 2012-07-16 17:49:12 +02:00
parent 676be9da16
commit 965dba63d7
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/autotype/AutoType.cpp
View file

@ -40,7 +40,7 @@ AutoType::AutoType(QObject* parent)
m_pluginLoader->setLoadHints(QLibrary::ResolveAllSymbolsHint); m_pluginLoader->setLoadHints(QLibrary::ResolveAllSymbolsHint);
// TODO: scan in proper paths // TODO: scan in proper paths
#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
m_pluginLoader->setFileName(QCoreApplication::applicationDirPath() + "/autotype/x11/libkeepassx-autotype-x11.so"); m_pluginLoader->setFileName(QCoreApplication::applicationDirPath() + "/autotype/x11/libkeepassx-autotype-x11.so");
#endif #endif

2
src/core/Config.cpp
View file

@ -52,7 +52,7 @@ Config::Config(QObject* parent)
QString userPath; QString userPath;
QString homePath = QDir::homePath(); QString homePath = QDir::homePath();
#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
// we can't use QDesktopServices on X11 as it uses XDG_DATA_HOME instead of XDG_CONFIG_HOME // we can't use QDesktopServices on X11 as it uses XDG_DATA_HOME instead of XDG_CONFIG_HOME
QByteArray env = qgetenv("XDG_CONFIG_HOME"); QByteArray env = qgetenv("XDG_CONFIG_HOME");
if (env.isEmpty()) { if (env.isEmpty()) {

4
src/core/DataPath.cpp
View file

@ -69,11 +69,11 @@ DataPath::DataPath()
else if (testSetDir(QString(KEEPASSX_SOURCE_DIR) + "/share")) { else if (testSetDir(QString(KEEPASSX_SOURCE_DIR) + "/share")) {
} }
#endif #endif
#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
else if (testSetDir(QCoreApplication::applicationDirPath() + "/../share/keepassx")) { else if (testSetDir(QCoreApplication::applicationDirPath() + "/../share/keepassx")) {
} }
#endif #endif
#ifdef Q_OS_MACOS #ifdef Q_OS_MAC
else if (testSetDir(QCoreApplication::applicationDirPath() + "/../Resources")) { else if (testSetDir(QCoreApplication::applicationDirPath() + "/../Resources")) {
} }
#endif #endif

8
src/gui/Clipboard.cpp
View file

@ -21,9 +21,9 @@
#include <QtGui/QApplication> #include <QtGui/QApplication>
#include <QtGui/QClipboard> #include <QtGui/QClipboard>
#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
#include <QtDBus/QDBusConnection> #include <QtDBus/QDBusConnection>
#include <QtDBus/QDBusMessage> #include <QtDBus/QDBusMessage>
#endif #endif
#include "core/Config.h" #include "core/Config.h"
@ -71,7 +71,7 @@ void Clipboard::clearClipboard()
clipboard->clear(QClipboard::Selection); clipboard->clear(QClipboard::Selection);
} }
#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
QDBusMessage message = QDBusMessage::createMethodCall("org.kde.klipper", "/klipper", "", "clearClipboardHistory"); QDBusMessage message = QDBusMessage::createMethodCall("org.kde.klipper", "/klipper", "", "clearClipboardHistory");
QDBusConnection::sessionBus().send(message); QDBusConnection::sessionBus().send(message);
#endif #endif