platform/unix: fix build with -no-feature-systemtrayicon

make sure qdbustrayicon_p.h is included only once
and only when systemtrayicon feature is enabled

qdbuslistener: stop including unused qdbustrayicon_p.h
this is a refactoring left-over

Pick-to: 6.10
Change-Id: Ib848dae56e865dc05453f25c31a08fb2ec2e8305
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>

Author: Nick Shaforostov

src/gui/platform/unix/qdbuslistener.cpp

@@ -7,7 +7,8 @@
 #include <private/qguiapplication_p.h>
 #include <qpa/qplatformintegration.h>
 #include <qpa/qplatformservices.h>
-#include <private/qdbustrayicon_p.h>
+#include <qdbusconnection.h>
+#include <qfile.h>
 #include <qjsonarray.h>
 #include <qjsondocument.h>
 #include <qjsonobject.h>

src/gui/platform/unix/qgenericunixtheme.cpp

@@ -39,18 +39,17 @@
 #include <QJsonObject>
 #include <QJsonValue>
 #include <QJsonParseError>
-#ifndef QT_NO_SYSTEMTRAYICON
-#include <private/qdbustrayicon_p.h>
 #include <private/qdbusmenubar_p.h>
 #endif
+#if QT_CONFIG(dbus) && QT_CONFIG(systemtrayicon)
+#include <private/qdbustrayicon_p.h>
 #endif
 
 #include <private/qguiapplication_p.h>
 #include <qpa/qplatformintegration.h>
 #include <QtCore/QStandardPaths>
 #if QT_CONFIG(dbus)
 #include <QtDBus/QDBusConnectionInterface>
-#include <private/qdbustrayicon_p.h>
 #endif
 #if QT_CONFIG(mimetype)
 #include <QtCore/QMimeDatabase>

src/gui/platform/unix/qgnometheme.cpp

@@ -5,8 +5,10 @@
 #include "qgnometheme_p.h"
 #include <qpa/qplatformdialoghelper.h>
 #include <qpa/qplatformfontdatabase.h>
-#if QT_CONFIG(dbus)
+#if QT_CONFIG(dbus) && QT_CONFIG(systemtrayicon)
 #  include <private/qdbustrayicon_p.h>
+#endif
+#if QT_CONFIG(dbus)
 #  include <private/qdbusmenubar_p.h>
 #endif
 #include <qpa/qwindowsysteminterface.h>

src/gui/platform/unix/qkdetheme.cpp

@@ -9,7 +9,9 @@
 #include <QPalette>
 #include <qpa/qwindowsysteminterface.h>
 #include "qdbuslistener_p.h"
+#if QT_CONFIG(dbus) && QT_CONFIG(systemtrayicon)
 #include <private/qdbustrayicon_p.h>
+#endif
 #include <private/qdbusplatformmenu_p.h>
 #include <private/qdbusmenubar_p.h>
 #include <QSettings>