diff options
Diffstat (limited to 'src/dbus/qdbusextratypes.h')
| -rw-r--r-- | src/dbus/qdbusextratypes.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/dbus/qdbusextratypes.h b/src/dbus/qdbusextratypes.h index 03d151f16d..c548cbe7bb 100644 --- a/src/dbus/qdbusextratypes.h +++ b/src/dbus/qdbusextratypes.h @@ -4,7 +4,7 @@ #ifndef QDBUSEXTRATYPES_H #define QDBUSEXTRATYPES_H -// define some useful types for D-BUS +// define some useful types for D-Bus #include <QtDBus/qtdbusglobal.h> #include <QtCore/qvariant.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) @@ -74,7 +77,10 @@ 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! |