1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gui: Add Q_GADGET to QPlatformScreen

Browse Source 
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>
This commit is contained in:
Ulf Hermann 2024-04-12 15:24:22 +02:00
parent f6777af17d
commit 551acf40ae
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/kernel/qplatformscreen.h
View File

@ -42,6 +42,7 @@ typedef QPair<qreal, qreal> QDpi;
class Q_GUI_EXPORT QPlatformScreen class Q_GUI_EXPORT QPlatformScreen
{ {
Q_GADGET
Q_DECLARE_PRIVATE(QPlatformScreen) Q_DECLARE_PRIVATE(QPlatformScreen)
public: public:

3
src/gui/kernel/qplatformsystemtrayicon.h
View File

@ -6,6 +6,7 @@
#define QPLATFORMSYSTEMTRAYICON_H #define QPLATFORMSYSTEMTRAYICON_H
#include <QtGui/qtguiglobal.h> #include <QtGui/qtguiglobal.h>
#include <qpa/qplatformscreen.h>
#include "QtCore/qobject.h" #include "QtCore/qobject.h"
#ifndef QT_NO_SYSTEMTRAYICON #ifndef QT_NO_SYSTEMTRAYICON
@ -13,7 +14,6 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QPlatformMenu; class QPlatformMenu;
class QPlatformScreen;
class QIcon; class QIcon;
class QString; class QString;
class QRect; class QRect;
@ -21,7 +21,6 @@ class QRect;
class Q_GUI_EXPORT QPlatformSystemTrayIcon : public QObject class Q_GUI_EXPORT QPlatformSystemTrayIcon : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_MOC_INCLUDE(<qpa/qplatformscreen.h>)
public: public:
enum ActivationReason { enum ActivationReason {
Unknown, Unknown,