diff options
Diffstat (limited to 'src')
20 files changed, 14 insertions, 63 deletions
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 61b961f568..80acf0b754 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -442,6 +442,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_accessibility SOURCES accessible/qaccessible.cpp accessible/qaccessible.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 diff --git a/src/gui/accessible/accessible.pri b/src/gui/accessible/accessible.pri index 95132d69de..7a376d98a2 100644 --- a/src/gui/accessible/accessible.pri +++ b/src/gui/accessible/accessible.pri @@ -6,16 +6,17 @@ qtConfig(accessibility) { accessible/qaccessiblecache_p.h \ accessible/qaccessibleobject.h \ accessible/qaccessibleplugin.h \ - accessible/qplatformaccessibility.h + accessible/qplatformaccessibility.h \ + accessible/qaccessiblebridge.h \ + accessible/qaccessiblebridgeutils_p.h SOURCES += accessible/qaccessible.cpp \ accessible/qaccessiblecache.cpp \ accessible/qaccessibleobject.cpp \ accessible/qaccessibleplugin.cpp \ - accessible/qplatformaccessibility.cpp - - HEADERS += accessible/qaccessiblebridge.h - SOURCES += accessible/qaccessiblebridge.cpp + accessible/qplatformaccessibility.cpp \ + accessible/qaccessiblebridge.cpp \ + accessible/qaccessiblebridgeutils.cpp mac { OBJECTIVE_SOURCES += accessible/qaccessiblecache_mac.mm diff --git a/src/platformsupport/accessibility/qaccessiblebridgeutils.cpp b/src/gui/accessible/qaccessiblebridgeutils.cpp index a15b93e31e..a15b93e31e 100644 --- a/src/platformsupport/accessibility/qaccessiblebridgeutils.cpp +++ b/src/gui/accessible/qaccessiblebridgeutils.cpp diff --git a/src/platformsupport/accessibility/qaccessiblebridgeutils_p.h b/src/gui/accessible/qaccessiblebridgeutils_p.h index cf8e126894..f34fcc5816 100644 --- a/src/platformsupport/accessibility/qaccessiblebridgeutils_p.h +++ b/src/gui/accessible/qaccessiblebridgeutils_p.h @@ -61,8 +61,8 @@ QT_REQUIRE_CONFIG(accessibility); QT_BEGIN_NAMESPACE namespace QAccessibleBridgeUtils { - QStringList effectiveActionNames(QAccessibleInterface *iface); - bool performEffectiveAction(QAccessibleInterface *iface, const QString &actionName); + Q_GUI_EXPORT QStringList effectiveActionNames(QAccessibleInterface *iface); + Q_GUI_EXPORT bool performEffectiveAction(QAccessibleInterface *iface, const QString &actionName); } QT_END_NAMESPACE diff --git a/src/platformsupport/CMakeLists.txt b/src/platformsupport/CMakeLists.txt index b18b27f5fb..6132d305f4 100644 --- a/src/platformsupport/CMakeLists.txt +++ b/src/platformsupport/CMakeLists.txt @@ -28,9 +28,6 @@ endif() if(QT_FEATURE_kms) add_subdirectory(kmsconvenience) endif() -if(QT_FEATURE_accessibility) - add_subdirectory(accessibility) -endif() if(QT_FEATURE_accessibility AND QT_FEATURE_accessibility_atspi_bridge) add_subdirectory(linuxaccessibility) endif() diff --git a/src/platformsupport/accessibility/CMakeLists.txt b/src/platformsupport/accessibility/CMakeLists.txt deleted file mode 100644 index 4757b123af..0000000000 --- a/src/platformsupport/accessibility/CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -# Generated from accessibility.pro. - -##################################################################### -## AccessibilitySupport Module: -##################################################################### - -qt_add_module(AccessibilitySupport - STATIC - INTERNAL_MODULE - SOURCES - qaccessiblebridgeutils.cpp qaccessiblebridgeutils_p.h - DEFINES - QT_NO_CAST_FROM_ASCII - PUBLIC_LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate -) - -#### Keys ignored in scope 1:.:.:accessibility.pro:<TRUE>: -# MODULE = "accessibility_support" diff --git a/src/platformsupport/accessibility/accessibility.pro b/src/platformsupport/accessibility/accessibility.pro deleted file mode 100644 index 1806d75630..0000000000 --- a/src/platformsupport/accessibility/accessibility.pro +++ /dev/null @@ -1,15 +0,0 @@ -TARGET = QtAccessibilitySupport -MODULE = accessibility_support - -QT = core-private gui-private -CONFIG += static internal_module - -DEFINES += QT_NO_CAST_FROM_ASCII - -HEADERS += \ - qaccessiblebridgeutils_p.h - -SOURCES += \ - qaccessiblebridgeutils.cpp - -load(qt_module) diff --git a/src/platformsupport/linuxaccessibility/CMakeLists.txt b/src/platformsupport/linuxaccessibility/CMakeLists.txt index 35bfdabf5f..0e1a7a9d16 100644 --- a/src/platformsupport/linuxaccessibility/CMakeLists.txt +++ b/src/platformsupport/linuxaccessibility/CMakeLists.txt @@ -31,7 +31,6 @@ qt_add_module(LinuxAccessibilitySupport QT_NO_CAST_FROM_ASCII PUBLIC_LIBRARIES PkgConfig::ATSPI2_nolink - Qt::AccessibilitySupportPrivate Qt::CorePrivate Qt::DBus Qt::GuiPrivate diff --git a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp index 88539b7220..dca57372fc 100644 --- a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp +++ b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp @@ -50,7 +50,7 @@ #ifndef QT_NO_ACCESSIBILITY #include "socket_interface.h" #include "constant_mappings_p.h" -#include <QtAccessibilitySupport/private/qaccessiblebridgeutils_p.h> +#include <QtGui/private/qaccessiblebridgeutils_p.h> #include "application_p.h" /*! diff --git a/src/platformsupport/linuxaccessibility/linuxaccessibility.pro b/src/platformsupport/linuxaccessibility/linuxaccessibility.pro index d6689c0fa3..9ccb4893d2 100644 --- a/src/platformsupport/linuxaccessibility/linuxaccessibility.pro +++ b/src/platformsupport/linuxaccessibility/linuxaccessibility.pro @@ -1,7 +1,7 @@ TARGET = QtLinuxAccessibilitySupport MODULE = linuxaccessibility_support -QT = core-private dbus gui-private accessibility_support-private +QT = core-private dbus gui-private CONFIG += static internal_module DEFINES += QT_NO_CAST_FROM_ASCII diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index f8f37b53a2..439685bfd8 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -27,10 +27,8 @@ qtConfig(kms): \ SUBDIRS += kmsconvenience qtConfig(accessibility) { - SUBDIRS += accessibility qtConfig(accessibility-atspi-bridge) { SUBDIRS += linuxaccessibility - linuxaccessibility.depends += accessibility } } diff --git a/src/plugins/platforms/android/CMakeLists.txt b/src/plugins/platforms/android/CMakeLists.txt index 5c754a9202..42e241dcfa 100644 --- a/src/plugins/platforms/android/CMakeLists.txt +++ b/src/plugins/platforms/android/CMakeLists.txt @@ -44,7 +44,6 @@ qt_internal_add_plugin(QAndroidIntegrationPlugin ${CMAKE_CURRENT_SOURCE_DIR} ${QT_SOURCE_TREE}/src/3rdparty/android PUBLIC_LIBRARIES - Qt::AccessibilitySupportPrivate Qt::Core Qt::CorePrivate Qt::EglSupportPrivate diff --git a/src/plugins/platforms/android/android.pro b/src/plugins/platforms/android/android.pro index 80d3bdd37f..778e7881cd 100644 --- a/src/plugins/platforms/android/android.pro +++ b/src/plugins/platforms/android/android.pro @@ -4,7 +4,7 @@ LIBS += -ljnigraphics -landroid QT += \ core-private gui-private \ - eventdispatcher_support-private accessibility_support-private \ + eventdispatcher_support-private \ fontdatabase_support-private egl_support-private qtConfig(opengl): QT += opengl-private diff --git a/src/plugins/platforms/android/androidjniaccessibility.cpp b/src/plugins/platforms/android/androidjniaccessibility.cpp index d4b7f38bf6..4012129b9f 100644 --- a/src/plugins/platforms/android/androidjniaccessibility.cpp +++ b/src/plugins/platforms/android/androidjniaccessibility.cpp @@ -41,7 +41,7 @@ #include "androidjnimain.h" #include "qandroidplatformintegration.h" #include "qpa/qplatformaccessibility.h" -#include <QtAccessibilitySupport/private/qaccessiblebridgeutils_p.h> +#include <QtGui/private/qaccessiblebridgeutils_p.h> #include "qguiapplication.h" #include "qwindow.h" #include "qrect.h" diff --git a/src/plugins/platforms/cocoa/CMakeLists.txt b/src/plugins/platforms/cocoa/CMakeLists.txt index 9f6f1d965d..4921ee1ef3 100644 --- a/src/plugins/platforms/cocoa/CMakeLists.txt +++ b/src/plugins/platforms/cocoa/CMakeLists.txt @@ -104,8 +104,6 @@ qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_accessibility SOURCES qcocoaaccessibility.h qcocoaaccessibility.mm qcocoaaccessibilityelement.h qcocoaaccessibilityelement.mm - PUBLIC_LIBRARIES - Qt::AccessibilitySupportPrivate ) qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionmanager diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro index 087835bd81..c4d0750b2a 100644 --- a/src/plugins/platforms/cocoa/cocoa.pro +++ b/src/plugins/platforms/cocoa/cocoa.pro @@ -76,7 +76,6 @@ qtConfig(vulkan) { } qtConfig(accessibility) { - QT += accessibility_support-private SOURCES += qcocoaaccessibilityelement.mm \ qcocoaaccessibility.mm HEADERS += qcocoaaccessibilityelement.h \ diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm index ad40c6b0cb..6ba0738191 100644 --- a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm +++ b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm @@ -43,7 +43,7 @@ #include "qcocoascreen.h" #include <QtGui/private/qaccessiblecache_p.h> -#include <QtAccessibilitySupport/private/qaccessiblebridgeutils_p.h> +#include <QtGui/private/qaccessiblebridgeutils_p.h> #include <QtGui/qaccessible.h> #import <AppKit/NSAccessibility.h> diff --git a/src/plugins/platforms/direct2d/direct2d.pro b/src/plugins/platforms/direct2d/direct2d.pro index d586c8dadb..09dce90291 100644 --- a/src/plugins/platforms/direct2d/direct2d.pro +++ b/src/plugins/platforms/direct2d/direct2d.pro @@ -5,8 +5,6 @@ QT += \ eventdispatcher_support-private \ fontdatabase_support-private theme_support-private -qtConfig(accessibility): QT += accessibility_support-private - LIBS += -ldwmapi -lversion -ld3d11 -ldxgi -ldxguid QMAKE_USE_PRIVATE += gdi32 dwrite_1 d2d1_1 diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt index 486654cfe1..f27f24ee73 100644 --- a/src/plugins/platforms/windows/CMakeLists.txt +++ b/src/plugins/platforms/windows/CMakeLists.txt @@ -115,8 +115,6 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility uiautomation/qwindowsuiautils.cpp uiautomation/qwindowsuiautils.h uiautomation/qwindowsuiavalueprovider.cpp uiautomation/qwindowsuiavalueprovider.h uiautomation/qwindowsuiawindowprovider.cpp uiautomation/qwindowsuiawindowprovider.h - PUBLIC_LIBRARIES - Qt::AccessibilitySupportPrivate ) qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_directwrite3 diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro index d311744675..484954c7b2 100644 --- a/src/plugins/platforms/windows/windows.pro +++ b/src/plugins/platforms/windows/windows.pro @@ -7,8 +7,6 @@ QT += \ qtConfig(opengl): QT += opengl-private -qtConfig(accessibility): QT += accessibility_support-private - qtConfig(directwrite3): DEFINES *= QT_USE_DIRECTWRITE2 QT_USE_DIRECTWRITE3 LIBS += -ldwmapi |