From 9f1b4d4e09d8ea6e09729a5248c91801b6e833d6 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 5 Jun 2024 22:21:19 +0200 Subject: [PATCH] Make QDBusObjectPath QDebug stream operator a hidden friend Because that's how we declare them these days. Found in API-review. Amends c89b1bbddc73b044762cabc67c1e5063a6ffee86. Change-Id: I5163952e43abc1185b8f8f5c5fde2b4839e78e0d Reviewed-by: Volker Hilsheimer Reviewed-by: Kai Uwe Broulik Reviewed-by: Thiago Macieira (cherry picked from commit 9387ea21cd4ab26dc6a5cdc5d6a732be1fe8e429) Reviewed-by: Qt Cherry-pick Bot --- src/dbus/qdbusextratypes.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dbus/qdbusextratypes.h b/src/dbus/qdbusextratypes.h index 1c0826b9922..c548cbe7bb5 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 {