From a3428f96ef61940cf6c1a2f7b66d5aef08967e33 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Sat, 24 Aug 2024 17:34:46 +0200 Subject: [PATCH] [PATCH] Consistently use WITH_QTDBUS instead of USE_DBUS USE_DBUS still uses an hardcoded list of architectures, whereas there is already WITH_QTDBUS defined in case the D-Bus support is available. Followup of commit 6bdab62068c89b61796246508813ae63aa3ef872. Gbp-Pq: Name upstream_Consistently-use-WITH_QTDBUS-instead-of-USE_DBUS.patch --- src/gui/openfilemanagerwindowjob.cpp | 2 +- src/gui/openfilemanagerwindowjob_p.h | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/gui/openfilemanagerwindowjob.cpp b/src/gui/openfilemanagerwindowjob.cpp index 974f92e..75a9a63 100644 --- a/src/gui/openfilemanagerwindowjob.cpp +++ b/src/gui/openfilemanagerwindowjob.cpp @@ -45,7 +45,7 @@ public: ~OpenFileManagerWindowJobPrivate() = default; -#if USE_DBUS +#ifdef WITH_QTDBUS void createDBusStrategy() { strategy = std::make_unique(q); diff --git a/src/gui/openfilemanagerwindowjob_p.h b/src/gui/openfilemanagerwindowjob_p.h index 63ddcac..22ad9fd 100644 --- a/src/gui/openfilemanagerwindowjob_p.h +++ b/src/gui/openfilemanagerwindowjob_p.h @@ -8,12 +8,6 @@ #ifndef OPENFILEMANAGERWINDOWJOB_P_H #define OPENFILEMANAGERWINDOWJOB_P_H -#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) -#define USE_DBUS 1 -#else -#define USE_DBUS 0 -#endif - #include namespace KIO @@ -43,7 +37,7 @@ protected: OpenFileManagerWindowJob *m_job; }; -#if USE_DBUS +#ifdef WITH_QTDBUS class OpenFileManagerWindowDBusStrategy : public AbstractOpenFileManagerWindowStrategy { public: -- 2.30.2