From caed0c3ac3e86ee82dc2b64f2a60ef317e77268b Mon Sep 17 00:00:00 2001
From: Fabian Kosmale <fabian.kosmale@qt.io>
Date: Sun, 6 Feb 2022 20:29:54 +0100
Subject: [PATCH] Gui: Do not depend on transitive includes

Change-Id: I27321235d9c8428de0cff1e22a618299b9e5a97f
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
---
 src/gui/accessible/linux/dbusconnection_p.h     | 1 +
 src/gui/kernel/qaction.h                        | 1 +
 src/gui/kernel/qguiapplication_p.h              | 1 +
 src/gui/kernel/qopenglcontext.h                 | 5 +++--
 src/gui/kernel/qplatformnativeinterface.cpp     | 2 ++
 src/gui/painting/qicc.cpp                       | 2 ++
 src/gui/platform/darwin/qapplekeymapper_p.h     | 1 +
 src/gui/platform/unix/qxkbcommon.cpp            | 1 +
 src/gui/rhi/qrhi_p_p.h                          | 2 ++
 src/gui/rhi/qrhigles2.cpp                       | 1 +
 src/gui/text/qcssparser.cpp                     | 1 +
 src/gui/text/qtextformat_p.h                    | 1 +
 src/gui/util/qtexturefiledata.cpp               | 4 +++-
 src/gui/vulkan/qbasicvulkanplatforminstance.cpp | 1 +
 src/tools/qvkgen/qvkgen.cpp                     | 1 +
 15 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/gui/accessible/linux/dbusconnection_p.h b/src/gui/accessible/linux/dbusconnection_p.h
index d82edc753a6..f8b6af806ff 100644
--- a/src/gui/accessible/linux/dbusconnection_p.h
+++ b/src/gui/accessible/linux/dbusconnection_p.h
@@ -52,6 +52,7 @@
 // We mean it.
 //
 
+#include <QtCore/QObject>
 #include <QtCore/QString>
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusVariant>
diff --git a/src/gui/kernel/qaction.h b/src/gui/kernel/qaction.h
index 34d2c2fb14a..d1d5b6d4672 100644
--- a/src/gui/kernel/qaction.h
+++ b/src/gui/kernel/qaction.h
@@ -47,6 +47,7 @@
 #include <QtGui/qicon.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qvariant.h>
+#include <QtCore/qobject.h>
 
 QT_REQUIRE_CONFIG(action);
 
diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h
index 3100b408efd..21d7af81b85 100644
--- a/src/gui/kernel/qguiapplication_p.h
+++ b/src/gui/kernel/qguiapplication_p.h
@@ -55,6 +55,7 @@
 #include <QtGui/qguiapplication.h>
 #include <QtGui/qicon.h>
 
+#include <QtCore/QHash>
 #include <QtCore/QPointF>
 #include <QtCore/private/qcoreapplication_p.h>
 
diff --git a/src/gui/kernel/qopenglcontext.h b/src/gui/kernel/qopenglcontext.h
index 36c3ed3a677..90395b62093 100644
--- a/src/gui/kernel/qopenglcontext.h
+++ b/src/gui/kernel/qopenglcontext.h
@@ -45,8 +45,9 @@
 #ifndef QT_NO_OPENGL
 
 #include <QtCore/qnamespace.h>
-#include <QtCore/QObject>
-#include <QtCore/QScopedPointer>
+#include <QtCore/qobject.h>
+#include <QtCore/qscopedpointer.h>
+#include <QtCore/qset.h>
 #include <QtCore/qnativeinterface.h>
 
 #include <QtGui/QSurfaceFormat>
diff --git a/src/gui/kernel/qplatformnativeinterface.cpp b/src/gui/kernel/qplatformnativeinterface.cpp
index 15b08e195a6..b2a36d2f49d 100644
--- a/src/gui/kernel/qplatformnativeinterface.cpp
+++ b/src/gui/kernel/qplatformnativeinterface.cpp
@@ -38,6 +38,8 @@
 ****************************************************************************/
 
 #include "qplatformnativeinterface.h"
+#include <QtCore/qvariant.h>
+#include <QtCore/qmap.h>
 #include <QtGui/qcursor.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/painting/qicc.cpp b/src/gui/painting/qicc.cpp
index 8f6a204caad..2aa719e96b1 100644
--- a/src/gui/painting/qicc.cpp
+++ b/src/gui/painting/qicc.cpp
@@ -41,6 +41,8 @@
 
 #include <qbuffer.h>
 #include <qbytearray.h>
+#include <qvarlengtharray.h>
+#include <qhash.h>
 #include <qdatastream.h>
 #include <qendian.h>
 #include <qloggingcategory.h>
diff --git a/src/gui/platform/darwin/qapplekeymapper_p.h b/src/gui/platform/darwin/qapplekeymapper_p.h
index 9b2b661b7b3..83be34d4611 100644
--- a/src/gui/platform/darwin/qapplekeymapper_p.h
+++ b/src/gui/platform/darwin/qapplekeymapper_p.h
@@ -56,6 +56,7 @@
 #endif
 
 #include <QtCore/QList>
+#include <QtCore/QHash>
 #include <QtGui/QKeyEvent>
 
 #include <QtCore/private/qcore_mac_p.h>
diff --git a/src/gui/platform/unix/qxkbcommon.cpp b/src/gui/platform/unix/qxkbcommon.cpp
index 9072030b958..9dd9f17b931 100644
--- a/src/gui/platform/unix/qxkbcommon.cpp
+++ b/src/gui/platform/unix/qxkbcommon.cpp
@@ -42,6 +42,7 @@
 #include <private/qmakearray_p.h>
 
 #include <QtCore/private/qstringiterator_p.h>
+#include <QtCore/qvarlengtharray.h>
 #include <QtCore/QMetaMethod>
 
 #include <QtGui/QKeyEvent>
diff --git a/src/gui/rhi/qrhi_p_p.h b/src/gui/rhi/qrhi_p_p.h
index 93cbc5ed350..77b76d2d0b8 100644
--- a/src/gui/rhi/qrhi_p_p.h
+++ b/src/gui/rhi/qrhi_p_p.h
@@ -55,6 +55,8 @@
 #include <QBitArray>
 #include <QAtomicInt>
 #include <QLoggingCategory>
+#include <QtCore/qset.h>
+#include <QtCore/qvarlengtharray.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/rhi/qrhigles2.cpp b/src/gui/rhi/qrhigles2.cpp
index 09425e0bb32..a70f0691914 100644
--- a/src/gui/rhi/qrhigles2.cpp
+++ b/src/gui/rhi/qrhigles2.cpp
@@ -41,6 +41,7 @@
 #include <QWindow>
 #include <QOffscreenSurface>
 #include <QOpenGLContext>
+#include <QtCore/qmap.h>
 #include <QtGui/private/qopenglextensions_p.h>
 #include <QtGui/private/qopenglprogrambinarycache_p.h>
 #include <qpa/qplatformopenglcontext.h>
diff --git a/src/gui/text/qcssparser.cpp b/src/gui/text/qcssparser.cpp
index 283c3d346d5..e3c7fe242d2 100644
--- a/src/gui/text/qcssparser.cpp
+++ b/src/gui/text/qcssparser.cpp
@@ -39,6 +39,7 @@
 
 #include "qcssparser_p.h"
 
+#include <QtCore/qmap.h>
 #include <qdebug.h>
 #include <qicon.h>
 #include <qcolor.h>
diff --git a/src/gui/text/qtextformat_p.h b/src/gui/text/qtextformat_p.h
index 13815d06b3b..f9642f57fb2 100644
--- a/src/gui/text/qtextformat_p.h
+++ b/src/gui/text/qtextformat_p.h
@@ -54,6 +54,7 @@
 #include <QtGui/private/qtguiglobal_p.h>
 #include "QtGui/qtextformat.h"
 #include "QtCore/qlist.h"
+#include <QtCore/qhash.h> // QMultiHash
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/util/qtexturefiledata.cpp b/src/gui/util/qtexturefiledata.cpp
index 6549206a26f..589fd4baed1 100644
--- a/src/gui/util/qtexturefiledata.cpp
+++ b/src/gui/util/qtexturefiledata.cpp
@@ -38,7 +38,9 @@
 ****************************************************************************/
 
 #include "qtexturefiledata_p.h"
-#include <QSize>
+#include <QtCore/qsize.h>
+#include <QtCore/qvarlengtharray.h>
+#include <QtCore/qmap.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/vulkan/qbasicvulkanplatforminstance.cpp b/src/gui/vulkan/qbasicvulkanplatforminstance.cpp
index dd39f71ba09..2f317e35781 100644
--- a/src/gui/vulkan/qbasicvulkanplatforminstance.cpp
+++ b/src/gui/vulkan/qbasicvulkanplatforminstance.cpp
@@ -41,6 +41,7 @@
 #include <QCoreApplication>
 #include <QList>
 #include <QLoggingCategory>
+#include <QVarLengthArray>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/qvkgen/qvkgen.cpp b/src/tools/qvkgen/qvkgen.cpp
index 6b0e7520a71..9470b748f32 100644
--- a/src/tools/qvkgen/qvkgen.cpp
+++ b/src/tools/qvkgen/qvkgen.cpp
@@ -30,6 +30,7 @@
 #include <QtCore/qfile.h>
 #include <QtCore/qfileinfo.h>
 #include <QtCore/qlist.h>
+#include <QtCore/qmap.h>
 #include <QtCore/qxmlstream.h>
 
 // generate wrappers for core functions from the following versions