From 0ec6b3049b4e486a1781ca75fc1afad05f4427d1 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Tue, 30 Oct 2018 10:28:41 +0100
Subject: [PATCH] Add linuxaccessibility support

Change-Id: I6766756e58cadf2d3f13331f4a453123ea575c6f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/platformsupport/CMakeLists.txt            |  3 +++
 .../linuxaccessibility/CMakeLists.txt         | 26 +++++++++++++++++++
 src/plugins/platforms/xcb/CMakeLists.txt      |  4 +--
 3 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 src/platformsupport/linuxaccessibility/CMakeLists.txt

diff --git a/src/platformsupport/CMakeLists.txt b/src/platformsupport/CMakeLists.txt
index 158cecbec0..c571f940c8 100644
--- a/src/platformsupport/CMakeLists.txt
+++ b/src/platformsupport/CMakeLists.txt
@@ -15,6 +15,9 @@ endif()
 
 if(QT_FEATURE_accessibility)
     add_subdirectory(accessibility)
+    if(QT_FEATURE_accessibility_atspi_bridge)
+        add_subdirectory(linuxaccessibility)
+    endif()
 endif()
 
 if(APPLE)
diff --git a/src/platformsupport/linuxaccessibility/CMakeLists.txt b/src/platformsupport/linuxaccessibility/CMakeLists.txt
new file mode 100644
index 0000000000..81e32e2666
--- /dev/null
+++ b/src/platformsupport/linuxaccessibility/CMakeLists.txt
@@ -0,0 +1,26 @@
+find_package(ATSPI2 REQUIRED)
+
+add_qt_module(LinuxAccessibilitySupport
+    STATIC
+    SOURCES
+        application.cpp application_p.h
+        atspiadaptor.cpp atspiadaptor_p.h
+        bridge.cpp bridge_p.h
+        cache.cpp cache_p.h
+        constant_mappings.cpp constant_mappings_p.h
+        dbusconnection.cpp dbusconnection_p.h
+        struct_marshallers.cpp struct_marshallers_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    LIBRARIES
+        Qt::AccessibilitySupportPrivate
+        Qt::CorePrivate
+        Qt::DBus
+        Qt::GuiPrivate
+        PkgConfig::ATSPI2
+    DBUS_ADAPTOR_SOURCES dbusxml/Cache.xml dbusxml/DeviceEventController.xml
+    DBUS_ADAPTOR_FLAGS -i struct_marshallers_p.h
+    DBUS_INTERFACE_SOURCES dbusxml/Socket.xml dbusxml/Bus.xml
+    DBUS_INTERFACE_FLAGS -i struct_marshallers_p.h
+)
+
diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt
index 90c924b4b1..fc7a6eb1bf 100644
--- a/src/plugins/platforms/xcb/CMakeLists.txt
+++ b/src/plugins/platforms/xcb/CMakeLists.txt
@@ -68,9 +68,9 @@ add_qt_module(XcbQpa
 ## Scopes:
 #####################################################################
 
-extend_target(XcbQpa CONDITION TARGET Qt::linuxaccessibility_support_private
+extend_target(XcbQpa CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate
     LIBRARIES
-        linuxaccessibility_supportPrivate
+        Qt::LinuxAccessibilitySupportPrivate
 )
 
 extend_target(XcbQpa CONDITION QT_FEATURE_vulkan