diff options
Diffstat (limited to 'src/dbus/qdbusextratypes.h')
| -rw-r--r-- | src/dbus/qdbusextratypes.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/dbus/qdbusextratypes.h b/src/dbus/qdbusextratypes.h index 1bc0f3086d..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,15 +72,15 @@ 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 { QString m_signature; public: - QDBusSignature() noexcept : m_signature() {} + QDBusSignature() noexcept + { + m_signature.detach(); // mark non-null (empty signatures are valid) + } // compiler-generated copy/move constructor/assignment operators are ok! // compiler-generated destructor is ok! |