build: KEYCHAIN_DBUS

frankosterfeld · Jan 23, 2020 · cbc626e · cbc626e
1 parent b16b442
commit cbc626e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -160,6 +160,7 @@ if(UNIX AND NOT APPLE AND NOT ANDROID)
         list(APPEND qtkeychain_LIBRARIES ${LIBSECRET_LIBRARIES})
     endif()
 
+    add_definitions(-DKEYCHAIN_DBUS=1)
     list(APPEND qtkeychain_SOURCES keychain_unix.cpp gnomekeyring.cpp libsecret.cpp plaintextstore.cpp)
     qt_add_dbus_interface(qtkeychain_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.KWallet.xml kwallet_interface KWalletInterface)
     list(APPEND qtkeychain_LIBRARIES ${QTDBUS_LIBRARIES} )

diff --git a/keychain_p.h b/keychain_p.h
@@ -15,7 +15,7 @@
 #include <QSettings>
 #include <QQueue>
 
-#if defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN) && !defined(Q_OS_ANDROID)
+#if defined(KEYCHAIN_DBUS)
 
 #include <QDBusPendingCallWatcher>
 
@@ -49,7 +49,7 @@ class JobPrivate : public QObject {
     Mode mode;
     QByteArray data;
 
-#if defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN) && !defined(Q_OS_ANDROID)
+#if defined(KEYCHAIN_DBUS)
     org::kde::KWallet* iface;
     int walletHandle;
 
@@ -93,7 +93,7 @@ class ReadPasswordJobPrivate : public JobPrivate {
     explicit ReadPasswordJobPrivate( const QString &service_, ReadPasswordJob* qq );
     void scheduledStart();
 
-#if defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN) && !defined(Q_OS_ANDROID)
+#if defined(KEYCHAIN_DBUS)
     void fallbackOnError(const QDBusError& err);
 
 private Q_SLOTS:
@@ -116,7 +116,7 @@ class WritePasswordJobPrivate : public JobPrivate {
     explicit WritePasswordJobPrivate( const QString &service_, WritePasswordJob* qq );
     void scheduledStart();
 
-#if defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN) && !defined(Q_OS_ANDROID)
+#if defined(KEYCHAIN_DBUS)
     void fallbackOnError(const QDBusError& err);
 #endif
 
@@ -130,7 +130,7 @@ class DeletePasswordJobPrivate : public JobPrivate {
 
     void scheduledStart();
 
-#if defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN) && !defined(Q_OS_ANDROID)
+#if defined(KEYCHAIN_DBUS)
     void fallbackOnError(const QDBusError& err);
 #endif