From 11a9af6484fc34b6b8fd166292b16229ed808c6b Mon Sep 17 00:00:00 2001
From: Alexey Edelev <alexey.edelev@qt.io>
Date: Wed, 28 Sep 2022 13:06:28 +0200
Subject: [PATCH] Fix build with disabled accessibility

Amends 8539e641f6f48a605547f66c47266d19e537f74e

Task-number: QTBUG-106941
Change-Id: Ieffe1ac0050c9f1377e4260376acb2f8cdc0f985
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 src/gui/CMakeLists.txt              | 6 ++++--
 src/widgets/kernel/qapplication.cpp | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index b611724835..1dd7bb3c30 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -59,6 +59,8 @@ qt_internal_add_module(Gui
         Qt::Network # special case:
     QMAKE_MODULE_CONFIG "${qmake_module_config}" # special case
     SOURCES
+        accessible/qaccessible.h
+        accessible/qplatformaccessibility.h
         image/qabstractfileiconengine.cpp image/qabstractfileiconengine_p.h
         image/qabstractfileiconprovider.cpp image/qabstractfileiconprovider.h image/qabstractfileiconprovider_p.h
         image/qbitmap.cpp image/qbitmap.h
@@ -490,13 +492,13 @@ qt_internal_extend_target(Gui CONDITION QT_FEATURE_egl
 
 qt_internal_extend_target(Gui CONDITION QT_FEATURE_accessibility
     SOURCES
-        accessible/qaccessible.cpp accessible/qaccessible.h accessible/qaccessible_base.h
+        accessible/qaccessible.cpp accessible/qaccessible_base.h
         accessible/qaccessiblebridge.cpp accessible/qaccessiblebridge.h
         accessible/qaccessiblebridgeutils.cpp accessible/qaccessiblebridgeutils_p.h
         accessible/qaccessiblecache.cpp accessible/qaccessiblecache_p.h
         accessible/qaccessibleobject.cpp accessible/qaccessibleobject.h
         accessible/qaccessibleplugin.cpp accessible/qaccessibleplugin.h
-        accessible/qplatformaccessibility.cpp accessible/qplatformaccessibility.h
+        accessible/qplatformaccessibility.cpp
 )
 
 qt_internal_extend_target(Gui CONDITION APPLE AND QT_FEATURE_accessibility
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index ea2e53867f..aef35735ba 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -50,10 +50,10 @@
 #endif
 #if QT_CONFIG(accessibility)
 #include <QtGui/qaccessible_base.h>
+#include "private/qaccessiblewidgetfactory_p.h"
 #endif
 
 #include "private/qkeymapper_p.h"
-#include "private/qaccessiblewidgetfactory_p.h"
 
 #include <qthread.h>
 #include <private/qthread_p.h>