diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/.prev_CMakeLists.txt | 25 | ||||
-rw-r--r-- | src/gui/CMakeLists.txt | 31 | ||||
-rw-r--r-- | src/gui/accessible/accessible.pri | 2 | ||||
-rw-r--r-- | src/gui/accessible/linux/.prev_CMakeLists.txt (renamed from src/platformsupport/linuxaccessibility/.prev_CMakeLists.txt) | 0 | ||||
-rw-r--r-- | src/gui/accessible/linux/CMakeLists.txt (renamed from src/platformsupport/linuxaccessibility/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | src/gui/accessible/linux/atspiadaptor.cpp (renamed from src/platformsupport/linuxaccessibility/atspiadaptor.cpp) | 4 | ||||
-rw-r--r-- | src/gui/accessible/linux/atspiadaptor_p.h (renamed from src/platformsupport/linuxaccessibility/atspiadaptor_p.h) | 6 | ||||
-rw-r--r-- | src/gui/accessible/linux/dbusconnection.cpp (renamed from src/platformsupport/linuxaccessibility/dbusconnection.cpp) | 0 | ||||
-rw-r--r-- | src/gui/accessible/linux/dbusconnection_p.h (renamed from src/platformsupport/linuxaccessibility/dbusconnection_p.h) | 4 | ||||
-rw-r--r-- | src/gui/accessible/linux/dbusxml/Bus.xml (renamed from src/platformsupport/linuxaccessibility/dbusxml/Bus.xml) | 0 | ||||
-rw-r--r-- | src/gui/accessible/linux/dbusxml/Cache.xml (renamed from src/platformsupport/linuxaccessibility/dbusxml/Cache.xml) | 0 | ||||
-rw-r--r-- | src/gui/accessible/linux/dbusxml/DeviceEventController.xml (renamed from src/platformsupport/linuxaccessibility/dbusxml/DeviceEventController.xml) | 0 | ||||
-rw-r--r-- | src/gui/accessible/linux/dbusxml/Socket.xml (renamed from src/platformsupport/linuxaccessibility/dbusxml/Socket.xml) | 0 | ||||
-rw-r--r-- | src/gui/accessible/linux/linux.pri | 27 | ||||
-rw-r--r-- | src/gui/accessible/linux/qspi_constant_mappings.cpp (renamed from src/platformsupport/linuxaccessibility/constant_mappings.cpp) | 2 | ||||
-rw-r--r-- | src/gui/accessible/linux/qspi_constant_mappings_p.h (renamed from src/platformsupport/linuxaccessibility/constant_mappings_p.h) | 7 | ||||
-rw-r--r-- | src/gui/accessible/linux/qspi_struct_marshallers.cpp (renamed from src/platformsupport/linuxaccessibility/struct_marshallers.cpp) | 4 | ||||
-rw-r--r-- | src/gui/accessible/linux/qspi_struct_marshallers_p.h (renamed from src/platformsupport/linuxaccessibility/struct_marshallers_p.h) | 7 | ||||
-rw-r--r-- | src/gui/accessible/linux/qspiaccessiblebridge.cpp (renamed from src/platformsupport/linuxaccessibility/bridge.cpp) | 8 | ||||
-rw-r--r-- | src/gui/accessible/linux/qspiaccessiblebridge_p.h (renamed from src/platformsupport/linuxaccessibility/bridge_p.h) | 6 | ||||
-rw-r--r-- | src/gui/accessible/linux/qspiapplicationadaptor.cpp (renamed from src/platformsupport/linuxaccessibility/application.cpp) | 2 | ||||
-rw-r--r-- | src/gui/accessible/linux/qspiapplicationadaptor_p.h (renamed from src/platformsupport/linuxaccessibility/application_p.h) | 4 | ||||
-rw-r--r-- | src/gui/accessible/linux/qspidbuscache.cpp (renamed from src/platformsupport/linuxaccessibility/cache.cpp) | 4 | ||||
-rw-r--r-- | src/gui/accessible/linux/qspidbuscache_p.h (renamed from src/platformsupport/linuxaccessibility/cache_p.h) | 6 | ||||
-rw-r--r-- | src/gui/platform/unix/dbusmenu/qdbusmenuconnection_p.h | 6 | ||||
-rw-r--r-- | src/platformsupport/.prev_CMakeLists.txt | 3 | ||||
-rw-r--r-- | src/platformsupport/CMakeLists.txt | 3 | ||||
-rw-r--r-- | src/platformsupport/linuxaccessibility/linuxaccessibility.pro | 36 | ||||
-rw-r--r-- | src/platformsupport/platformsupport.pro | 6 | ||||
-rw-r--r-- | src/plugins/platforms/xcb/.prev_CMakeLists.txt | 9 | ||||
-rw-r--r-- | src/plugins/platforms/xcb/CMakeLists.txt | 9 | ||||
-rw-r--r-- | src/plugins/platforms/xcb/qxcbintegration.cpp | 2 | ||||
-rw-r--r-- | src/plugins/platforms/xcb/xcb_qpa_lib.pro | 3 | ||||
-rw-r--r-- | src/src.pro | 2 |
34 files changed, 120 insertions, 108 deletions
diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt index 31eb39fb95..a4820965e7 100644 --- a/src/gui/.prev_CMakeLists.txt +++ b/src/gui/.prev_CMakeLists.txt @@ -399,6 +399,23 @@ qt_extend_target(Gui CONDITION QT_FEATURE_accessibility AND WIN32 accessible/windows/apisupport/uiatypes_p.h ) +qt_extend_target(Gui CONDITION QT_FEATURE_accessibility AND QT_FEATURE_accessibility_atspi_bridge + SOURCES + accessible/linux/atspiadaptor.cpp accessible/linux/atspiadaptor_p.h + accessible/linux/dbusconnection.cpp accessible/linux/dbusconnection_p.h + accessible/linux/qspi_constant_mappings.cpp accessible/linux/qspi_constant_mappings_p.h + accessible/linux/qspi_struct_marshallers.cpp accessible/linux/qspi_struct_marshallers_p.h + accessible/linux/qspiaccessiblebridge.cpp accessible/linux/qspiaccessiblebridge_p.h + accessible/linux/qspiapplicationadaptor.cpp accessible/linux/qspiapplicationadaptor_p.h + accessible/linux/qspidbuscache.cpp accessible/linux/qspidbuscache_p.h + DBUS_ADAPTOR_SOURCES + accessibility_adaptors + DBUS_INTERFACE_SOURCES + accessibility_interfaces + PUBLIC_LIBRARIES + PkgConfig::ATSPI2_nolink +) + qt_extend_target(Gui CONDITION QT_FEATURE_action SOURCES kernel/qaction.cpp kernel/qaction.h kernel/qaction_p.h @@ -433,7 +450,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_png WrapPNG::WrapPNG ) -#### Keys ignored in scope 38:.:image:image/image.pri:WIN32 AND MINGW: +#### Keys ignored in scope 40:.:image:image/image.pri:WIN32 AND MINGW: # GCC_VERSION = "$${QMAKE_GCC_MAJOR_VERSION}.$${QMAKE_GCC_MINOR_VERSION}.$${QMAKE_GCC_PATCH_VERSION}" qt_extend_target(Gui CONDITION ((QT_FEATURE_png) AND (WIN32 AND MINGW)) AND (GCC_VERSION___equals___8.1.0) @@ -676,7 +693,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_vulkan Vulkan::Vulkan_nolink ) -#### Keys ignored in scope 99:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen: +#### Keys ignored in scope 101:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen: # QMAKE_EXTRA_COMPILERS = "qvkgen_h" "qvkgen_ph" "qvkgen_pimpl" # QMAKE_QVKGEN_INPUT = "vulkan/vk.xml" # QMAKE_QVKGEN_LICENSE_HEADER = "$$QT_SOURCE_TREE/header.LGPL" @@ -692,10 +709,10 @@ qt_extend_target(Gui CONDITION QT_FEATURE_vulkan # qvkgen_pimpl.input = "QMAKE_QVKGEN_INPUT" # qvkgen_pimpl.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.cpp" -#### Keys ignored in scope 100:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan: +#### Keys ignored in scope 102:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan: # qvkgen_h.variable_out = "HEADERS" -#### Keys ignored in scope 101:.:vulkan:vulkan/vulkan.pri:else: +#### Keys ignored in scope 103:.:vulkan:vulkan/vulkan.pri:else: # qvkgen_h.CONFIG = "target_predeps" "no_link" qt_extend_target(Gui CONDITION WASM diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index db6f463c0b..21dc18721e 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -487,6 +487,31 @@ qt_extend_target(Gui CONDITION QT_FEATURE_accessibility AND WIN32 accessible/windows/apisupport/uiatypes_p.h ) +qt_extend_target(Gui CONDITION QT_FEATURE_accessibility AND QT_FEATURE_accessibility_atspi_bridge + SOURCES + accessible/linux/atspiadaptor.cpp accessible/linux/atspiadaptor_p.h + accessible/linux/dbusconnection.cpp accessible/linux/dbusconnection_p.h + accessible/linux/qspi_constant_mappings.cpp accessible/linux/qspi_constant_mappings_p.h + accessible/linux/qspi_struct_marshallers.cpp accessible/linux/qspi_struct_marshallers_p.h + accessible/linux/qspiaccessiblebridge.cpp accessible/linux/qspiaccessiblebridge_p.h + accessible/linux/qspiapplicationadaptor.cpp accessible/linux/qspiapplicationadaptor_p.h + accessible/linux/qspidbuscache.cpp accessible/linux/qspidbuscache_p.h +# special case begin + DBUS_ADAPTOR_SOURCES + accessible/linux/dbusxml/Cache.xml + accessible/linux/dbusxml/DeviceEventController.xml + DBUS_ADAPTOR_FLAGS + "-i" "QtGui/private/qspi_struct_marshallers_p.h" + DBUS_INTERFACE_SOURCES + accessible/linux/dbusxml/Bus.xml + accessible/linux/dbusxml/Socket.xml + DBUS_INTERFACE_FLAGS + "-i" "QtGui/private/qspi_struct_marshallers_p.h" +# special case end + PUBLIC_LIBRARIES + PkgConfig::ATSPI2_nolink +) + qt_extend_target(Gui CONDITION QT_FEATURE_action SOURCES kernel/qaction.cpp kernel/qaction.h kernel/qaction_p.h @@ -521,7 +546,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_png WrapPNG::WrapPNG ) -#### Keys ignored in scope 38:.:image:image/image.pri:WIN32 AND MINGW: +#### Keys ignored in scope 40:.:image:image/image.pri:WIN32 AND MINGW: # GCC_VERSION = "$${QMAKE_GCC_MAJOR_VERSION}.$${QMAKE_GCC_MINOR_VERSION}.$${QMAKE_GCC_PATCH_VERSION}" qt_extend_target(Gui CONDITION ((QT_FEATURE_png) AND (WIN32 AND MINGW)) AND (GCC_VERSION___equals___8.1.0) @@ -839,10 +864,10 @@ add_custom_command( # qvkgen_pimpl.input = "QMAKE_QVKGEN_INPUT" # qvkgen_pimpl.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.cpp" -#### Keys ignored in scope 100:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan: +#### Keys ignored in scope 102:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan: # qvkgen_h.variable_out = "HEADERS" -#### Keys ignored in scope 101:.:vulkan:vulkan/vulkan.pri:else: +#### Keys ignored in scope 103:.:vulkan:vulkan/vulkan.pri:else: # qvkgen_h.CONFIG = "target_predeps" "no_link" qt_extend_target(Gui CONDITION WASM diff --git a/src/gui/accessible/accessible.pri b/src/gui/accessible/accessible.pri index 471e2fbaea..cc403ba9e9 100644 --- a/src/gui/accessible/accessible.pri +++ b/src/gui/accessible/accessible.pri @@ -25,4 +25,6 @@ qtConfig(accessibility) { } win32: include(windows/windows.pri) + + qtConfig(accessibility-atspi-bridge): include(linux/linux.pri) } diff --git a/src/platformsupport/linuxaccessibility/.prev_CMakeLists.txt b/src/gui/accessible/linux/.prev_CMakeLists.txt index ffb0ca9610..ffb0ca9610 100644 --- a/src/platformsupport/linuxaccessibility/.prev_CMakeLists.txt +++ b/src/gui/accessible/linux/.prev_CMakeLists.txt diff --git a/src/platformsupport/linuxaccessibility/CMakeLists.txt b/src/gui/accessible/linux/CMakeLists.txt index 0e1a7a9d16..0e1a7a9d16 100644 --- a/src/platformsupport/linuxaccessibility/CMakeLists.txt +++ b/src/gui/accessible/linux/CMakeLists.txt diff --git a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp b/src/gui/accessible/linux/atspiadaptor.cpp index c4ff9a211b..65b014c9e1 100644 --- a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp +++ b/src/gui/accessible/linux/atspiadaptor.cpp @@ -49,10 +49,10 @@ #ifndef QT_NO_ACCESSIBILITY #include "socket_interface.h" -#include "constant_mappings_p.h" +#include "qspi_constant_mappings_p.h" #include <QtGui/private/qaccessiblebridgeutils_p.h> -#include "application_p.h" +#include "qspiapplicationadaptor_p.h" /*! \class AtSpiAdaptor \internal diff --git a/src/platformsupport/linuxaccessibility/atspiadaptor_p.h b/src/gui/accessible/linux/atspiadaptor_p.h index 97d302a779..b9f4011695 100644 --- a/src/platformsupport/linuxaccessibility/atspiadaptor_p.h +++ b/src/gui/accessible/linux/atspiadaptor_p.h @@ -45,8 +45,8 @@ // W A R N I N G // ------------- // -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to // version without notice, or even be removed. // // We mean it. @@ -60,7 +60,7 @@ #include <QtGui/qaccessible.h> #include "dbusconnection_p.h" -#include "struct_marshallers_p.h" +#include "qspi_struct_marshallers_p.h" QT_REQUIRE_CONFIG(accessibility); diff --git a/src/platformsupport/linuxaccessibility/dbusconnection.cpp b/src/gui/accessible/linux/dbusconnection.cpp index 45ddc8e496..45ddc8e496 100644 --- a/src/platformsupport/linuxaccessibility/dbusconnection.cpp +++ b/src/gui/accessible/linux/dbusconnection.cpp diff --git a/src/platformsupport/linuxaccessibility/dbusconnection_p.h b/src/gui/accessible/linux/dbusconnection_p.h index dde3bbb98f..826630fddc 100644 --- a/src/platformsupport/linuxaccessibility/dbusconnection_p.h +++ b/src/gui/accessible/linux/dbusconnection_p.h @@ -45,8 +45,8 @@ // W A R N I N G // ------------- // -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to // version without notice, or even be removed. // // We mean it. diff --git a/src/platformsupport/linuxaccessibility/dbusxml/Bus.xml b/src/gui/accessible/linux/dbusxml/Bus.xml index 5a33e335a1..5a33e335a1 100644 --- a/src/platformsupport/linuxaccessibility/dbusxml/Bus.xml +++ b/src/gui/accessible/linux/dbusxml/Bus.xml diff --git a/src/platformsupport/linuxaccessibility/dbusxml/Cache.xml b/src/gui/accessible/linux/dbusxml/Cache.xml index 01c52810ac..01c52810ac 100644 --- a/src/platformsupport/linuxaccessibility/dbusxml/Cache.xml +++ b/src/gui/accessible/linux/dbusxml/Cache.xml diff --git a/src/platformsupport/linuxaccessibility/dbusxml/DeviceEventController.xml b/src/gui/accessible/linux/dbusxml/DeviceEventController.xml index d4c26ef7e7..d4c26ef7e7 100644 --- a/src/platformsupport/linuxaccessibility/dbusxml/DeviceEventController.xml +++ b/src/gui/accessible/linux/dbusxml/DeviceEventController.xml diff --git a/src/platformsupport/linuxaccessibility/dbusxml/Socket.xml b/src/gui/accessible/linux/dbusxml/Socket.xml index 75ec99f994..75ec99f994 100644 --- a/src/platformsupport/linuxaccessibility/dbusxml/Socket.xml +++ b/src/gui/accessible/linux/dbusxml/Socket.xml diff --git a/src/gui/accessible/linux/linux.pri b/src/gui/accessible/linux/linux.pri new file mode 100644 index 0000000000..43e59cb7bc --- /dev/null +++ b/src/gui/accessible/linux/linux.pri @@ -0,0 +1,27 @@ +accessibility_adaptors.files = accessible/linux/dbusxml/Cache.xml accessible/linux/dbusxml/DeviceEventController.xml +accessibility_adaptors.header_flags = -i QtGui/private/qspi_struct_marshallers_p.h +DBUS_ADAPTORS += accessibility_adaptors + +accessibility_interfaces.files = accessible/linux/dbusxml/Socket.xml accessible/linux/dbusxml/Bus.xml +accessibility_interfaces.header_flags = -i QtGui/private/qspi_struct_marshallers_p.h +DBUS_INTERFACES += accessibility_interfaces + +HEADERS += \ + accessible/linux/atspiadaptor_p.h \ + accessible/linux/dbusconnection_p.h \ + accessible/linux/qspi_constant_mappings_p.h \ + accessible/linux/qspi_struct_marshallers_p.h \ + accessible/linux/qspiaccessiblebridge_p.h \ + accessible/linux/qspiapplicationadaptor_p.h \ + accessible/linux/qspidbuscache_p.h + +SOURCES += \ + accessible/linux/atspiadaptor.cpp \ + accessible/linux/dbusconnection.cpp \ + accessible/linux/qspi_constant_mappings.cpp \ + accessible/linux/qspi_struct_marshallers.cpp \ + accessible/linux/qspiaccessiblebridge.cpp \ + accessible/linux/qspiapplicationadaptor.cpp \ + accessible/linux/qspidbuscache.cpp + +QMAKE_USE += atspi/nolink diff --git a/src/platformsupport/linuxaccessibility/constant_mappings.cpp b/src/gui/accessible/linux/qspi_constant_mappings.cpp index fce2919e73..d4fe3ecd69 100644 --- a/src/platformsupport/linuxaccessibility/constant_mappings.cpp +++ b/src/gui/accessible/linux/qspi_constant_mappings.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ -#include "constant_mappings_p.h" +#include "qspi_constant_mappings_p.h" #include <qobject.h> #include <qdebug.h> diff --git a/src/platformsupport/linuxaccessibility/constant_mappings_p.h b/src/gui/accessible/linux/qspi_constant_mappings_p.h index 1d4dd833e1..292b5e1597 100644 --- a/src/platformsupport/linuxaccessibility/constant_mappings_p.h +++ b/src/gui/accessible/linux/qspi_constant_mappings_p.h @@ -41,8 +41,8 @@ // W A R N I N G // ------------- // -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to // version without notice, or even be removed. // // We mean it. @@ -56,7 +56,7 @@ #ifndef Q_SPI_CONSTANT_MAPPINGS_H #define Q_SPI_CONSTANT_MAPPINGS_H -#include "struct_marshallers_p.h" +#include "qspi_struct_marshallers_p.h" #include <QtGui/private/qtguiglobal_p.h> #include <QtGui/QAccessible> @@ -124,7 +124,6 @@ private: }; extern QHash <QAccessible::Role, RoleNames> qSpiRoleMapping; -extern QHash <int, AtspiStateType> qSpiStateMapping; inline void setSpiStateBit(quint64* state, AtspiStateType spiState) { diff --git a/src/platformsupport/linuxaccessibility/struct_marshallers.cpp b/src/gui/accessible/linux/qspi_struct_marshallers.cpp index 9bbaf23332..1f49d8533f 100644 --- a/src/platformsupport/linuxaccessibility/struct_marshallers.cpp +++ b/src/gui/accessible/linux/qspi_struct_marshallers.cpp @@ -38,13 +38,13 @@ ****************************************************************************/ -#include "struct_marshallers_p.h" +#include "qspi_struct_marshallers_p.h" #include <atspi/atspi-constants.h> #include <QtCore/qdebug.h> #include <QtDBus/qdbusmetatype.h> -#include "bridge_p.h" +#include "qspiaccessiblebridge_p.h" #ifndef QT_NO_ACCESSIBILITY QT_BEGIN_NAMESPACE diff --git a/src/platformsupport/linuxaccessibility/struct_marshallers_p.h b/src/gui/accessible/linux/qspi_struct_marshallers_p.h index c8cc05ab5b..876c2bf700 100644 --- a/src/platformsupport/linuxaccessibility/struct_marshallers_p.h +++ b/src/gui/accessible/linux/qspi_struct_marshallers_p.h @@ -45,8 +45,8 @@ // W A R N I N G // ------------- // -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to // version without notice, or even be removed. // // We mean it. @@ -194,4 +194,7 @@ Q_DECLARE_METATYPE(QSpiAttributeSet) Q_DECLARE_METATYPE(QSpiAppUpdate) Q_DECLARE_METATYPE(QSpiDeviceEvent) +// For qdbusxml2cpp-generated code +QT_USE_NAMESPACE + #endif /* Q_SPI_STRUCT_MARSHALLERS_H */ diff --git a/src/platformsupport/linuxaccessibility/bridge.cpp b/src/gui/accessible/linux/qspiaccessiblebridge.cpp index fdc8cd3198..9ae8767b66 100644 --- a/src/platformsupport/linuxaccessibility/bridge.cpp +++ b/src/gui/accessible/linux/qspiaccessiblebridge.cpp @@ -38,17 +38,17 @@ ****************************************************************************/ -#include "bridge_p.h" +#include "qspiaccessiblebridge_p.h" #include <atspi/atspi-constants.h> #include <qstring.h> #include "atspiadaptor_p.h" -#include "cache_p.h" -#include "constant_mappings_p.h" +#include "qspidbuscache_p.h" +#include "qspi_constant_mappings_p.h" #include "dbusconnection_p.h" -#include "struct_marshallers_p.h" +#include "qspi_struct_marshallers_p.h" #ifndef QT_NO_ACCESSIBILITY #include "deviceeventcontroller_adaptor.h" diff --git a/src/platformsupport/linuxaccessibility/bridge_p.h b/src/gui/accessible/linux/qspiaccessiblebridge_p.h index c48bbd3710..ce1b755826 100644 --- a/src/platformsupport/linuxaccessibility/bridge_p.h +++ b/src/gui/accessible/linux/qspiaccessiblebridge_p.h @@ -45,8 +45,8 @@ // W A R N I N G // ------------- // -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to // version without notice, or even be removed. // // We mean it. @@ -66,7 +66,7 @@ class DBusConnection; class QSpiDBusCache; class AtSpiAdaptor; -class QSpiAccessibleBridge: public QObject, public QPlatformAccessibility +class Q_GUI_EXPORT QSpiAccessibleBridge: public QObject, public QPlatformAccessibility { Q_OBJECT public: diff --git a/src/platformsupport/linuxaccessibility/application.cpp b/src/gui/accessible/linux/qspiapplicationadaptor.cpp index 7852e407ad..430dc13b00 100644 --- a/src/platformsupport/linuxaccessibility/application.cpp +++ b/src/gui/accessible/linux/qspiapplicationadaptor.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ -#include "application_p.h" +#include "qspiapplicationadaptor_p.h" #include <QtCore/qcoreapplication.h> #include <QtDBus/qdbuspendingreply.h> diff --git a/src/platformsupport/linuxaccessibility/application_p.h b/src/gui/accessible/linux/qspiapplicationadaptor_p.h index 6a8786dc07..ca206edcd4 100644 --- a/src/platformsupport/linuxaccessibility/application_p.h +++ b/src/gui/accessible/linux/qspiapplicationadaptor_p.h @@ -44,8 +44,8 @@ // W A R N I N G // ------------- // -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to // version without notice, or even be removed. // // We mean it. diff --git a/src/platformsupport/linuxaccessibility/cache.cpp b/src/gui/accessible/linux/qspidbuscache.cpp index fe4d1e26f9..189cd2adf8 100644 --- a/src/platformsupport/linuxaccessibility/cache.cpp +++ b/src/gui/accessible/linux/qspidbuscache.cpp @@ -38,8 +38,8 @@ ****************************************************************************/ -#include "cache_p.h" -#include "bridge_p.h" +#include "qspidbuscache_p.h" +#include "qspiaccessiblebridge_p.h" #ifndef QT_NO_ACCESSIBILITY #include "cache_adaptor.h" diff --git a/src/platformsupport/linuxaccessibility/cache_p.h b/src/gui/accessible/linux/qspidbuscache_p.h index cc55acc6f8..89bee59d3a 100644 --- a/src/platformsupport/linuxaccessibility/cache_p.h +++ b/src/gui/accessible/linux/qspidbuscache_p.h @@ -45,8 +45,8 @@ // W A R N I N G // ------------- // -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to // version without notice, or even be removed. // // We mean it. @@ -54,7 +54,7 @@ #include <QtGui/private/qtguiglobal_p.h> #include <QtCore/QObject> -#include "struct_marshallers_p.h" +#include "qspi_struct_marshallers_p.h" QT_REQUIRE_CONFIG(accessibility); diff --git a/src/gui/platform/unix/dbusmenu/qdbusmenuconnection_p.h b/src/gui/platform/unix/dbusmenu/qdbusmenuconnection_p.h index bbdaad1e89..acd34c20ac 100644 --- a/src/gui/platform/unix/dbusmenu/qdbusmenuconnection_p.h +++ b/src/gui/platform/unix/dbusmenu/qdbusmenuconnection_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef DBUSCONNECTION_H -#define DBUSCONNECTION_H +#ifndef QDBUSMENUCONNECTION_H +#define QDBUSMENUCONNECTION_H // // W A R N I N G @@ -98,4 +98,4 @@ private: QT_END_NAMESPACE -#endif // DBUSCONNECTION_H +#endif // QDBUSMENUCONNECTION_H diff --git a/src/platformsupport/.prev_CMakeLists.txt b/src/platformsupport/.prev_CMakeLists.txt index c43707948b..9e2f19bee6 100644 --- a/src/platformsupport/.prev_CMakeLists.txt +++ b/src/platformsupport/.prev_CMakeLists.txt @@ -15,6 +15,3 @@ endif() if(QT_FEATURE_kms) add_subdirectory(kmsconvenience) endif() -if(QT_FEATURE_accessibility AND QT_FEATURE_accessibility_atspi_bridge) - add_subdirectory(linuxaccessibility) -endif() diff --git a/src/platformsupport/CMakeLists.txt b/src/platformsupport/CMakeLists.txt index fd308c99fd..db2fb62261 100644 --- a/src/platformsupport/CMakeLists.txt +++ b/src/platformsupport/CMakeLists.txt @@ -19,6 +19,3 @@ endif() if(QT_FEATURE_kms) add_subdirectory(kmsconvenience) endif() -if(QT_FEATURE_accessibility AND QT_FEATURE_accessibility_atspi_bridge) - add_subdirectory(linuxaccessibility) -endif() diff --git a/src/platformsupport/linuxaccessibility/linuxaccessibility.pro b/src/platformsupport/linuxaccessibility/linuxaccessibility.pro deleted file mode 100644 index 9ccb4893d2..0000000000 --- a/src/platformsupport/linuxaccessibility/linuxaccessibility.pro +++ /dev/null @@ -1,36 +0,0 @@ -TARGET = QtLinuxAccessibilitySupport -MODULE = linuxaccessibility_support - -QT = core-private dbus gui-private -CONFIG += static internal_module - -DEFINES += QT_NO_CAST_FROM_ASCII -PRECOMPILED_HEADER = ../../corelib/global/qt_pch.h - -DBUS_ADAPTORS = $$PWD/dbusxml/Cache.xml $$PWD/dbusxml/DeviceEventController.xml -QDBUSXML2CPP_ADAPTOR_HEADER_FLAGS = -i struct_marshallers_p.h - -DBUS_INTERFACES = $$PWD/dbusxml/Socket.xml $$PWD/dbusxml/Bus.xml -QDBUSXML2CPP_INTERFACE_HEADER_FLAGS = -i struct_marshallers_p.h - -QMAKE_USE += atspi/nolink - -HEADERS += \ - application_p.h \ - bridge_p.h \ - cache_p.h \ - struct_marshallers_p.h \ - constant_mappings_p.h \ - dbusconnection_p.h \ - atspiadaptor_p.h - -SOURCES += \ - application.cpp \ - bridge.cpp \ - cache.cpp \ - struct_marshallers.cpp \ - constant_mappings.cpp \ - dbusconnection.cpp \ - atspiadaptor.cpp - -load(qt_module) diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index 76ed9da61a..5a73a0edfb 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -17,12 +17,6 @@ qtConfig(xlib):qtConfig(opengl):!qtConfig(opengles2): \ qtConfig(kms): \ SUBDIRS += kmsconvenience -qtConfig(accessibility) { - qtConfig(accessibility-atspi-bridge) { - SUBDIRS += linuxaccessibility - } -} - !android:linux*:qtHaveModule(dbus) \ SUBDIRS += linuxofono diff --git a/src/plugins/platforms/xcb/.prev_CMakeLists.txt b/src/plugins/platforms/xcb/.prev_CMakeLists.txt index 7f0a0b01d0..0cf401037e 100644 --- a/src/plugins/platforms/xcb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/xcb/.prev_CMakeLists.txt @@ -67,11 +67,6 @@ qt_extend_target(XcbQpa CONDITION QT_FEATURE_opengl Qt::OpenGLPrivate ) -qt_extend_target(XcbQpa CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate - PUBLIC_LIBRARIES - Qt::LinuxAccessibilitySupportPrivate -) - qt_extend_target(XcbQpa CONDITION QT_FEATURE_glib LIBRARIES GLIB2::GLIB2 @@ -149,12 +144,12 @@ qt_internal_add_plugin(QXcbIntegrationPlugin Qt::XcbQpaPrivate ) -#### Keys ignored in scope 19:.:.:xcb-plugin.pro:<TRUE>: +#### Keys ignored in scope 18:.:.:xcb-plugin.pro:<TRUE>: # OTHER_FILES = "xcb.json" "README" ## Scopes: ##################################################################### -#### Keys ignored in scope 21:.:.:xcb-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: +#### Keys ignored in scope 20:.:.:xcb-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" add_subdirectory(gl_integrations) diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt index a7c2d5610a..22a955fec6 100644 --- a/src/plugins/platforms/xcb/CMakeLists.txt +++ b/src/plugins/platforms/xcb/CMakeLists.txt @@ -70,11 +70,6 @@ qt_extend_target(XcbQpa CONDITION QT_FEATURE_opengl Qt::OpenGLPrivate ) -qt_extend_target(XcbQpa CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate - PUBLIC_LIBRARIES - Qt::LinuxAccessibilitySupportPrivate -) - qt_extend_target(XcbQpa CONDITION QT_FEATURE_glib LIBRARIES GLIB2::GLIB2 @@ -176,13 +171,13 @@ qt_internal_add_plugin(QXcbIntegrationPlugin Qt::XcbQpaPrivate ) -#### Keys ignored in scope 19:.:.:xcb-plugin.pro:<TRUE>: +#### Keys ignored in scope 18:.:.:xcb-plugin.pro:<TRUE>: # OTHER_FILES = "xcb.json" "README" ## Scopes: ##################################################################### -#### Keys ignored in scope 21:.:.:xcb-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: +#### Keys ignored in scope 20:.:.:xcb-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" add_subdirectory(gl_integrations) if(OFF) diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp index fd64185852..d93c7b3268 100644 --- a/src/plugins/platforms/xcb/qxcbintegration.cpp +++ b/src/plugins/platforms/xcb/qxcbintegration.cpp @@ -90,7 +90,7 @@ #ifndef QT_NO_ACCESSIBILITY #include <qpa/qplatformaccessibility.h> #ifndef QT_NO_ACCESSIBILITY_ATSPI_BRIDGE -#include <QtLinuxAccessibilitySupport/private/bridge_p.h> +#include <QtGui/private/qspiaccessiblebridge_p.h> #endif #endif diff --git a/src/plugins/platforms/xcb/xcb_qpa_lib.pro b/src/plugins/platforms/xcb/xcb_qpa_lib.pro index 809ae2b212..a146b62e17 100644 --- a/src/plugins/platforms/xcb/xcb_qpa_lib.pro +++ b/src/plugins/platforms/xcb/xcb_qpa_lib.pro @@ -7,9 +7,6 @@ QT += \ qtConfig(opengl): QT += opengl-private -qtHaveModule(linuxaccessibility_support-private): \ - QT += linuxaccessibility_support-private - qtConfig(glib) : QMAKE_USE_PRIVATE += glib SOURCES = \ diff --git a/src/src.pro b/src/src.pro index da827979d2..8179815a94 100644 --- a/src/src.pro +++ b/src/src.pro @@ -182,7 +182,7 @@ qtConfig(dbus) { qtConfig(accessibility-atspi-bridge): \ src_platformsupport.depends += src_dbus src_tools_qdbusxml2cpp src_plugins.depends += src_dbus src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml - src_gui.depends += src_dbus + src_gui.depends += src_dbus src_tools_qdbusxml2cpp } android { |