From 484af9cb042c075815200e571695b881b9e6130c Mon Sep 17 00:00:00 2001
From: Fabian Kosmale <fabian.kosmale@qt.io>
Date: Fri, 11 Mar 2022 11:14:01 +0100
Subject: wayland: do not rely on transitive includes

Change-Id: I149e04d31ef3e897e25a91450427237069af4c34
Reviewed-by: Liang Qi <liang.qi@qt.io>
---
 src/client/qwaylanddataoffer_p.h                                       | 3 +++
 src/client/qwaylandextendedsurface_p.h                                 | 1 +
 src/client/qwaylandinputcontext.cpp                                    | 1 +
 src/client/qwaylandinputmethodcontext_p.h                              | 2 ++
 src/client/qwaylandnativeinterface_p.h                                 | 1 +
 src/client/qwaylandwindow_p.h                                          | 2 ++
 src/compositor/compositor_api/qwaylandtouch_p.h                        | 1 +
 src/compositor/extensions/qwaylandqttextinputmethod_p.h                | 1 +
 src/compositor/extensions/qwaylandtextinput_p.h                        | 1 +
 src/compositor/extensions/qwaylandxdgoutputv1_p.h                      | 2 ++
 src/compositor/wayland_wrapper/qwlbuffermanager_p.h                    | 1 +
 .../linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.cpp    | 1 +
 src/hardwareintegration/compositor/vulkan-server/vulkanwrapper.cpp     | 1 +
 .../compositor/wayland-egl/waylandeglclientbufferintegration.cpp       | 1 +
 14 files changed, 19 insertions(+)

(limited to 'src')

diff --git a/src/client/qwaylanddataoffer_p.h b/src/client/qwaylanddataoffer_p.h
index c641ad306..bf100193d 100644
--- a/src/client/qwaylanddataoffer_p.h
+++ b/src/client/qwaylanddataoffer_p.h
@@ -51,6 +51,9 @@
 // We mean it.
 //
 
+#include <QtCore/qhash.h>
+#include <QtCore/qstring.h>
+
 #include <QtGui/private/qinternalmimedata_p.h>
 
 #include <QtWaylandClient/private/qtwaylandclientglobal_p.h>
diff --git a/src/client/qwaylandextendedsurface_p.h b/src/client/qwaylandextendedsurface_p.h
index 97458d8d4..7748feb7a 100644
--- a/src/client/qwaylandextendedsurface_p.h
+++ b/src/client/qwaylandextendedsurface_p.h
@@ -53,6 +53,7 @@
 
 #include <QtCore/QString>
 #include <QtCore/QVariant>
+#include <QtCore/QMap> // for QVariantMap
 
 #include <QtWaylandClient/qtwaylandclientglobal.h>
 
diff --git a/src/client/qwaylandinputcontext.cpp b/src/client/qwaylandinputcontext.cpp
index 32433cdc0..b70f70f28 100644
--- a/src/client/qwaylandinputcontext.cpp
+++ b/src/client/qwaylandinputcontext.cpp
@@ -44,6 +44,7 @@
 #include <QtGui/QGuiApplication>
 #include <QtGui/QTextCharFormat>
 #include <QtGui/QWindow>
+#include <QtCore/QVarLengthArray>
 
 #include "qwaylanddisplay_p.h"
 #include "qwaylandinputdevice_p.h"
diff --git a/src/client/qwaylandinputmethodcontext_p.h b/src/client/qwaylandinputmethodcontext_p.h
index 6ce3ba71e..cae6fc9b1 100644
--- a/src/client/qwaylandinputmethodcontext_p.h
+++ b/src/client/qwaylandinputmethodcontext_p.h
@@ -55,6 +55,8 @@
 #include <QtGui/qevent.h>
 #include <QtCore/qlocale.h>
 #include <QtCore/qpointer.h>
+#include <QtCore/qlist.h>
+#include <QtCore/qhash.h>
 
 #include <QtWaylandClient/private/qwayland-qt-text-input-method-unstable-v1.h>
 #include <QtCore/private/qglobal_p.h>
diff --git a/src/client/qwaylandnativeinterface_p.h b/src/client/qwaylandnativeinterface_p.h
index 89ea132d3..a2d26ef76 100644
--- a/src/client/qwaylandnativeinterface_p.h
+++ b/src/client/qwaylandnativeinterface_p.h
@@ -56,6 +56,7 @@
 
 #include <QtWaylandClient/qtwaylandclientglobal.h>
 #include <QtCore/private/qglobal_p.h>
+#include <QtCore/qhash.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h
index 70d878f44..4bbcc93c3 100644
--- a/src/client/qwaylandwindow_p.h
+++ b/src/client/qwaylandwindow_p.h
@@ -60,6 +60,8 @@
 #include <QtCore/QVariant>
 #include <QtCore/QLoggingCategory>
 #include <QtCore/QElapsedTimer>
+#include <QtCore/QList>
+#include <QtCore/QMap> // for QVariantMap
 
 #include <qpa/qplatformwindow.h>
 
diff --git a/src/compositor/compositor_api/qwaylandtouch_p.h b/src/compositor/compositor_api/qwaylandtouch_p.h
index 31ebba475..8202f575b 100644
--- a/src/compositor/compositor_api/qwaylandtouch_p.h
+++ b/src/compositor/compositor_api/qwaylandtouch_p.h
@@ -50,6 +50,7 @@
 #include <QtWaylandCompositor/QWaylandCompositor>
 
 #include <QtCore/QPoint>
+#include <QtCore/qvarlengtharray.h>
 #include <QtCore/private/qobject_p.h>
 
 #include <QtWaylandCompositor/private/qwayland-server-wayland.h>
diff --git a/src/compositor/extensions/qwaylandqttextinputmethod_p.h b/src/compositor/extensions/qwaylandqttextinputmethod_p.h
index 1d46d140e..e7b21d913 100644
--- a/src/compositor/extensions/qwaylandqttextinputmethod_p.h
+++ b/src/compositor/extensions/qwaylandqttextinputmethod_p.h
@@ -38,6 +38,7 @@
 #include <QtWaylandCompositor/qwaylanddestroylistener.h>
 
 #include <QtCore/qrect.h>
+#include <QtCore/qhash.h>
 
 //
 //  W A R N I N G
diff --git a/src/compositor/extensions/qwaylandtextinput_p.h b/src/compositor/extensions/qwaylandtextinput_p.h
index db1bed45e..3377ebc94 100644
--- a/src/compositor/extensions/qwaylandtextinput_p.h
+++ b/src/compositor/extensions/qwaylandtextinput_p.h
@@ -36,6 +36,7 @@
 
 #include <QtCore/QObject>
 #include <QtCore/QMap>
+#include <QtCore/QHash>
 #include <QtCore/QRect>
 #include <QtGui/QInputMethod>
 #include <QtWaylandCompositor/QWaylandSurface>
diff --git a/src/compositor/extensions/qwaylandxdgoutputv1_p.h b/src/compositor/extensions/qwaylandxdgoutputv1_p.h
index ca1703d8a..ebc64d16f 100644
--- a/src/compositor/extensions/qwaylandxdgoutputv1_p.h
+++ b/src/compositor/extensions/qwaylandxdgoutputv1_p.h
@@ -30,6 +30,8 @@
 #ifndef QWAYLANDXDGOUTPUTV1_P_H
 #define QWAYLANDXDGOUTPUTV1_P_H
 
+#include <QtCore/QHash>
+
 #include <QWaylandOutput>
 #include <QWaylandXdgOutputV1>
 #include <QtWaylandCompositor/private/qwaylandcompositorextension_p.h>
diff --git a/src/compositor/wayland_wrapper/qwlbuffermanager_p.h b/src/compositor/wayland_wrapper/qwlbuffermanager_p.h
index 277cc407e..1a7941185 100644
--- a/src/compositor/wayland_wrapper/qwlbuffermanager_p.h
+++ b/src/compositor/wayland_wrapper/qwlbuffermanager_p.h
@@ -42,6 +42,7 @@
 //
 
 #include <QtCore/QObject>
+#include <QtCore/QHash>
 #include "qwlclientbuffer_p.h"
 QT_BEGIN_NAMESPACE
 
diff --git a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.cpp b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.cpp
index 90c104c28..3cc7c4e65 100644
--- a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.cpp
+++ b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.cpp
@@ -34,6 +34,7 @@
 #include <QtWaylandCompositor/private/qwayland-server-wayland.h>
 #include <qpa/qplatformnativeinterface.h>
 #include <QtOpenGL/QOpenGLTexture>
+#include <QtCore/QVarLengthArray>
 #include <QtGui/QGuiApplication>
 #include <QtGui/QOpenGLContext>
 
diff --git a/src/hardwareintegration/compositor/vulkan-server/vulkanwrapper.cpp b/src/hardwareintegration/compositor/vulkan-server/vulkanwrapper.cpp
index 6ab970f78..e3ab9f2d2 100644
--- a/src/hardwareintegration/compositor/vulkan-server/vulkanwrapper.cpp
+++ b/src/hardwareintegration/compositor/vulkan-server/vulkanwrapper.cpp
@@ -34,6 +34,7 @@
 #include "vulkanwrapper.h"
 
 #include <QImage>
+#include <QVarLengthArray>
 #include <QOpenGLContext>
 #include <QtGui/qopengl.h>
 #include <QtOpenGL/private/qvkconvenience_p.h>
diff --git a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp
index 5d53b615e..c707f6e90 100644
--- a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp
+++ b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp
@@ -42,6 +42,7 @@
 
 #include <QMutex>
 #include <QMutexLocker>
+#include <QVarLengthArray>
 #include <QtCore/private/qcore_unix_p.h>
 #include <QtGui/private/qeglstreamconvenience_p.h>
 
-- 
cgit v1.2.3