From 4fe8ed628892af1d2069ec0e18c90ccd0bbf6bf2 Mon Sep 17 00:00:00 2001
From: Fabian Kosmale <fabian.kosmale@qt.io>
Date: Fri, 4 Feb 2022 23:33:21 +0100
Subject: [PATCH] Reduce qaccessible includes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Forward declare some types in qaccessiblewidgetfactory_p.h instead of
including qaccessible.h. In turn, qapplication.cpp which relied on
transitive includes now needs to include qaccessible_base.h.

Change-Id: I8ac00d45a7ffccd84769fb210f29364a45bcd59e
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
---
 src/widgets/accessible/qaccessiblewidgetfactory_p.h | 5 ++++-
 src/widgets/kernel/qapplication.cpp                 | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/widgets/accessible/qaccessiblewidgetfactory_p.h b/src/widgets/accessible/qaccessiblewidgetfactory_p.h
index 5da609ddcae..01a4f52fbc3 100644
--- a/src/widgets/accessible/qaccessiblewidgetfactory_p.h
+++ b/src/widgets/accessible/qaccessiblewidgetfactory_p.h
@@ -38,7 +38,6 @@
 ****************************************************************************/
 
 #include <QtWidgets/private/qtwidgetsglobal_p.h>
-#include <QtGui/qaccessible.h>
 
 #ifndef QACCESSIBLEWIDGETFACTORY_H
 #define QACCESSIBLEWIDGETFACTORY_H
@@ -56,6 +55,10 @@
 
 QT_BEGIN_NAMESPACE
 
+class QObject;
+class QAccessibleInterface;
+class QString;
+
 QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *object);
 
 QT_END_NAMESPACE
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index 8485fb87718..502cecd67f7 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -84,6 +84,9 @@
 #if QT_CONFIG(whatsthis)
 #include <QtWidgets/QWhatsThis>
 #endif
+#ifndef QT_NO_ACCESSIBILITY
+#include <QtGui/qaccessible_base.h>
+#endif
 
 #include "private/qkeymapper_p.h"
 #include "private/qaccessiblewidgetfactory_p.h"