diff options
Diffstat (limited to 'src/platformsupport/dbustray/qdbustraytypes_p.h')
-rw-r--r-- | src/platformsupport/dbustray/qdbustraytypes_p.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/platformsupport/dbustray/qdbustraytypes_p.h b/src/platformsupport/dbustray/qdbustraytypes_p.h index 5b275e0d33..2e1421eccd 100644 --- a/src/platformsupport/dbustray/qdbustraytypes_p.h +++ b/src/platformsupport/dbustray/qdbustraytypes_p.h @@ -35,6 +35,8 @@ #ifndef QDBUSTRAYTYPES_P_H #define QDBUSTRAYTYPES_P_H +#ifndef QT_NO_SYSTEMTRAYICON + #include <QObject> #include <QString> #include <QDBusArgument> @@ -42,6 +44,8 @@ #include <QDBusObjectPath> #include <QPixmap> +QT_BEGIN_NAMESPACE + // Custom message type to send icons across D-Bus struct QXdgDBusImageStruct { @@ -66,16 +70,17 @@ struct QXdgDBusToolTipStruct const QDBusArgument &operator<<(QDBusArgument &argument, const QXdgDBusImageStruct &icon); const QDBusArgument &operator>>(const QDBusArgument &argument, QXdgDBusImageStruct &icon); -Q_DECLARE_METATYPE(QXdgDBusImageStruct) - const QDBusArgument &operator<<(QDBusArgument &argument, const QXdgDBusImageVector &iconVector); const QDBusArgument &operator>>(const QDBusArgument &argument, QXdgDBusImageVector &iconVector); -Q_DECLARE_METATYPE(QXdgDBusImageVector) - const QDBusArgument &operator<<(QDBusArgument &argument, const QXdgDBusToolTipStruct &toolTip); const QDBusArgument &operator>>(const QDBusArgument &argument, QXdgDBusToolTipStruct &toolTip); +QT_END_NAMESPACE + +Q_DECLARE_METATYPE(QXdgDBusImageStruct) +Q_DECLARE_METATYPE(QXdgDBusImageVector) Q_DECLARE_METATYPE(QXdgDBusToolTipStruct) +#endif // QT_NO_SYSTEMTRAYICON #endif // QDBUSTRAYTYPES_P_H |