diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2024-04-12 15:24:22 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2024-04-16 21:57:06 +0200 |
| commit | 551acf40aec3a1effa6237e9e4749ef9133f77bb (patch) | |
| tree | 0b1a591f2321112e0498504383e4dd6c7f75383d /src/gui/kernel | |
| parent | f6777af17d5d8caf31f0d4704ea49a95ce724f8f (diff) | |
Gui: Add Q_GADGET to QPlatformScreen
It's exposed in the QPlatformSystemTrayIcon::contextMenuRequested()
signal. In order to make sense of it on meta object level, it needs a
Q_GADGET.
Task-number: QTBUG-101143
Change-Id: I327d31f36e2cf3460398e328b26e9e5e5edec45e
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qplatformscreen.h | 1 | ||||
| -rw-r--r-- | src/gui/kernel/qplatformsystemtrayicon.h | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qplatformscreen.h b/src/gui/kernel/qplatformscreen.h index de704f4635..a547a635e9 100644 --- a/src/gui/kernel/qplatformscreen.h +++ b/src/gui/kernel/qplatformscreen.h @@ -42,6 +42,7 @@ typedef QPair<qreal, qreal> QDpi; class Q_GUI_EXPORT QPlatformScreen { + Q_GADGET Q_DECLARE_PRIVATE(QPlatformScreen) public: diff --git a/src/gui/kernel/qplatformsystemtrayicon.h b/src/gui/kernel/qplatformsystemtrayicon.h index c2c80f9334..76a7ef03d9 100644 --- a/src/gui/kernel/qplatformsystemtrayicon.h +++ b/src/gui/kernel/qplatformsystemtrayicon.h @@ -6,6 +6,7 @@ #define QPLATFORMSYSTEMTRAYICON_H #include <QtGui/qtguiglobal.h> +#include <qpa/qplatformscreen.h> #include "QtCore/qobject.h" #ifndef QT_NO_SYSTEMTRAYICON @@ -13,7 +14,6 @@ QT_BEGIN_NAMESPACE class QPlatformMenu; -class QPlatformScreen; class QIcon; class QString; class QRect; @@ -21,7 +21,6 @@ class QRect; class Q_GUI_EXPORT QPlatformSystemTrayIcon : public QObject { Q_OBJECT - Q_MOC_INCLUDE(<qpa/qplatformscreen.h>) public: enum ActivationReason { Unknown, |