diff options
| author | Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp> | 2023-02-11 23:16:45 +0900 |
|---|---|---|
| committer | Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp> | 2023-02-21 09:33:02 +0900 |
| commit | 80c1f3493fb44849159201ad50b680be794b612e (patch) | |
| tree | daec7c49660d802ff883059870d7724ce08973a5 /src | |
| parent | a05cbaaae505dba2546c593e22fe2f9047c0de4b (diff) | |
Fix build with -no-feature-systemtrayicon
Pick-to: 6.5
Change-Id: I04b09223dcc155735fc3893c74cf63594b7fe7f6
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/labs/platform/qquicklabsplatformmenu.cpp | 2 | ||||
| -rw-r--r-- | src/labs/platform/qquicklabsplatformmenu_p.h | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/labs/platform/qquicklabsplatformmenu.cpp b/src/labs/platform/qquicklabsplatformmenu.cpp index 60a7843001..c8e9b854e2 100644 --- a/src/labs/platform/qquicklabsplatformmenu.cpp +++ b/src/labs/platform/qquicklabsplatformmenu.cpp @@ -321,6 +321,7 @@ void QQuickLabsPlatformMenu::setParentMenu(QQuickLabsPlatformMenu *menu) emit parentMenuChanged(); } +#if QT_CONFIG(systemtrayicon) /*! \readonly \qmlproperty SystemTrayIcon Qt.labs.platform::Menu::systemTrayIcon @@ -342,6 +343,7 @@ void QQuickLabsPlatformMenu::setSystemTrayIcon(QQuickLabsPlatformSystemTrayIcon destroy(); emit systemTrayIconChanged(); } +#endif /*! \readonly diff --git a/src/labs/platform/qquicklabsplatformmenu_p.h b/src/labs/platform/qquicklabsplatformmenu_p.h index 14672713bd..b8577dcf49 100644 --- a/src/labs/platform/qquicklabsplatformmenu_p.h +++ b/src/labs/platform/qquicklabsplatformmenu_p.h @@ -47,7 +47,9 @@ class QQuickLabsPlatformMenu : public QObject, public QQmlParserStatus Q_PROPERTY(QQmlListProperty<QQuickLabsPlatformMenuItem> items READ items NOTIFY itemsChanged FINAL) Q_PROPERTY(QQuickLabsPlatformMenuBar *menuBar READ menuBar NOTIFY menuBarChanged FINAL) Q_PROPERTY(QQuickLabsPlatformMenu *parentMenu READ parentMenu NOTIFY parentMenuChanged FINAL) +#if QT_CONFIG(systemtrayicon) Q_PROPERTY(QQuickLabsPlatformSystemTrayIcon *systemTrayIcon READ systemTrayIcon NOTIFY systemTrayIconChanged FINAL) +#endif Q_PROPERTY(QQuickLabsPlatformMenuItem *menuItem READ menuItem CONSTANT FINAL) Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged FINAL) Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged FINAL) @@ -76,8 +78,10 @@ public: QQuickLabsPlatformMenu *parentMenu() const; void setParentMenu(QQuickLabsPlatformMenu *menu); +#if QT_CONFIG(systemtrayicon) QQuickLabsPlatformSystemTrayIcon *systemTrayIcon() const; void setSystemTrayIcon(QQuickLabsPlatformSystemTrayIcon *icon); +#endif QQuickLabsPlatformMenuItem *menuItem() const; |