5 files changed, 9 insertions, 7 deletions
diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt
index 9c3f6d23d2..a3ec0aac22 100644
--- a/src/dbus/CMakeLists.txt
+++ b/src/dbus/CMakeLists.txt
@@ -54,7 +54,6 @@ qt_internal_add_module(DBus
         Qt::Core
     PRIVATE_MODULE_INTERFACE
         Qt::CorePrivate
-    GENERATE_CPP_EXPORTS
 )
 
 # This file is included by qdbusargument.cpp
diff --git a/src/dbus/qdbusabstractadaptor.cpp b/src/dbus/qdbusabstractadaptor.cpp
index afe769fcd0..806a1b5f1f 100644
--- a/src/dbus/qdbusabstractadaptor.cpp
+++ b/src/dbus/qdbusabstractadaptor.cpp
@@ -8,7 +8,6 @@
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qmetaobject.h>
 #include <QtCore/qset.h>
-#include <QtCore/qtimer.h>
 #include <QtCore/qthread.h>
 
 #include "qdbusconnection.h"
diff --git a/src/dbus/qdbusextratypes.cpp b/src/dbus/qdbusextratypes.cpp
index 3354e76577..355a764e9c 100644
--- a/src/dbus/qdbusextratypes.cpp
+++ b/src/dbus/qdbusextratypes.cpp
@@ -13,6 +13,11 @@ QT_IMPL_METATYPE_EXTERN(QDBusObjectPath)
 QT_IMPL_METATYPE_EXTERN(QDBusSignature)
 
 #ifndef QT_NO_DEBUG_STREAM
+/*!
+    \fn QDebug QDBusObjectPath::operator<<(QDebug dbg, const QDBusObjectPath &path)
+    \since 6.8
+    Writes the contents of \a path to \a dbg.
+*/
 QDebug operator<<(QDebug dbg, const QDBusObjectPath &path)
 {
     QDebugStateSaver saver(dbg);
diff --git a/src/dbus/qdbusextratypes.h b/src/dbus/qdbusextratypes.h
index 1c0826b992..c548cbe7bb 100644
--- a/src/dbus/qdbusextratypes.h
+++ b/src/dbus/qdbusextratypes.h
@@ -38,6 +38,9 @@ public:
     operator QVariant() const;
 
 private:
+#ifndef QT_NO_DEBUG_STREAM
+    Q_DBUS_EXPORT friend QDebug operator<<(QDebug, const QDBusObjectPath &);
+#endif
     void doCheck();
 };
 Q_DECLARE_SHARED(QDBusObjectPath)
@@ -69,9 +72,6 @@ inline bool operator<(const QDBusObjectPath &lhs, const QDBusObjectPath &rhs)
 inline size_t qHash(const QDBusObjectPath &objectPath, size_t seed = 0)
 { return qHash(objectPath.path(), seed); }
 
-#ifndef QT_NO_DEBUG_STREAM
-Q_DBUS_EXPORT QDebug operator<<(QDebug, const QDBusObjectPath &);
-#endif
 
 class Q_DBUS_EXPORT QDBusSignature
 {
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
index 836562f496..534999378d 100644
--- a/src/dbus/qdbusintegrator.cpp
+++ b/src/dbus/qdbusintegrator.cpp
@@ -11,7 +11,6 @@
 #include <qobject.h>
 #include <qsocketnotifier.h>
 #include <qstringlist.h>
-#include <qtimer.h>
 #include <qthread.h>
 #include <private/qlocking_p.h>
 #include <QtCore/qset.h>
@@ -50,7 +49,7 @@ QT_IMPL_METATYPE_EXTERN(QDBusSlotCache)
 // used with dbus_server_allocate_data_slot
 static dbus_int32_t server_slot = -1;
 
-Q_LOGGING_CATEGORY(dbusIntegration, "qt.dbus.integration", QtWarningMsg)
+Q_STATIC_LOGGING_CATEGORY(dbusIntegration, "qt.dbus.integration", QtWarningMsg)
 
 Q_CONSTINIT static QBasicAtomicInt isDebugging = Q_BASIC_ATOMIC_INITIALIZER(-1);
 #define qDBusDebug              if (::isDebugging.loadRelaxed() == 0); else qDebug