1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move QtAccessibilitySupport into QtGui

Browse Source 
Task-number: QTBUG-83255
Change-Id: Ibc1b38e77c3c90030a832c41f4de65c6c38bc91d
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Tor Arne Vestbø 2020-03-31 15:56:40 +02:00
parent 33fc2ff663
commit 93a04332eb
24 changed files with 15 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/CMakeLists.txt
View File

@ -442,6 +442,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_accessibility
SOURCES SOURCES
accessible/qaccessible.cpp accessible/qaccessible.h accessible/qaccessible.cpp accessible/qaccessible.h
accessible/qaccessiblebridge.cpp accessible/qaccessiblebridge.h accessible/qaccessiblebridge.cpp accessible/qaccessiblebridge.h
accessible/qaccessiblebridgeutils.cpp accessible/qaccessiblebridgeutils_p.h
accessible/qaccessiblecache.cpp accessible/qaccessiblecache_p.h accessible/qaccessiblecache.cpp accessible/qaccessiblecache_p.h
accessible/qaccessibleobject.cpp accessible/qaccessibleobject.h accessible/qaccessibleobject.cpp accessible/qaccessibleobject.h
accessible/qaccessibleplugin.cpp accessible/qaccessibleplugin.h accessible/qaccessibleplugin.cpp accessible/qaccessibleplugin.h

11
src/gui/accessible/accessible.pri
View File

@ -6,16 +6,17 @@ qtConfig(accessibility) {
accessible/qaccessiblecache_p.h \ accessible/qaccessiblecache_p.h \
accessible/qaccessibleobject.h \ accessible/qaccessibleobject.h \
accessible/qaccessibleplugin.h \ accessible/qaccessibleplugin.h \
accessible/qplatformaccessibility.h accessible/qplatformaccessibility.h \
accessible/qaccessiblebridge.h \
accessible/qaccessiblebridgeutils_p.h
SOURCES += accessible/qaccessible.cpp \ SOURCES += accessible/qaccessible.cpp \
accessible/qaccessiblecache.cpp \ accessible/qaccessiblecache.cpp \
accessible/qaccessibleobject.cpp \ accessible/qaccessibleobject.cpp \
accessible/qaccessibleplugin.cpp \ accessible/qaccessibleplugin.cpp \
accessible/qplatformaccessibility.cpp accessible/qplatformaccessibility.cpp \
accessible/qaccessiblebridge.cpp \
HEADERS += accessible/qaccessiblebridge.h accessible/qaccessiblebridgeutils.cpp
SOURCES += accessible/qaccessiblebridge.cpp
mac { mac {
OBJECTIVE_SOURCES += accessible/qaccessiblecache_mac.mm OBJECTIVE_SOURCES += accessible/qaccessiblecache_mac.mm

0
src/platformsupport/accessibility/qaccessiblebridgeutils.cpp → src/gui/accessible/qaccessiblebridgeutils.cpp
View File

4
src/platformsupport/accessibility/qaccessiblebridgeutils_p.h → src/gui/accessible/qaccessiblebridgeutils_p.h
View File

@ -61,8 +61,8 @@ QT_REQUIRE_CONFIG(accessibility);
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace QAccessibleBridgeUtils { namespace QAccessibleBridgeUtils {
QStringList effectiveActionNames(QAccessibleInterface *iface); Q_GUI_EXPORT QStringList effectiveActionNames(QAccessibleInterface *iface);
bool performEffectiveAction(QAccessibleInterface *iface, const QString &actionName); Q_GUI_EXPORT bool performEffectiveAction(QAccessibleInterface *iface, const QString &actionName);
} }
QT_END_NAMESPACE QT_END_NAMESPACE

3
src/platformsupport/CMakeLists.txt
View File

@ -28,9 +28,6 @@ endif()
if(QT_FEATURE_kms) if(QT_FEATURE_kms)
add_subdirectory(kmsconvenience) add_subdirectory(kmsconvenience)
endif() endif()
if(QT_FEATURE_accessibility)
add_subdirectory(accessibility)
endif()
if(QT_FEATURE_accessibility AND QT_FEATURE_accessibility_atspi_bridge) if(QT_FEATURE_accessibility AND QT_FEATURE_accessibility_atspi_bridge)
add_subdirectory(linuxaccessibility) add_subdirectory(linuxaccessibility)
endif() endif()

20
src/platformsupport/accessibility/CMakeLists.txt
View File

@ -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"

15
src/platformsupport/accessibility/accessibility.pro
View File

@ -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)

1
src/platformsupport/linuxaccessibility/CMakeLists.txt
View File

@ -31,7 +31,6 @@ qt_add_module(LinuxAccessibilitySupport
QT_NO_CAST_FROM_ASCII QT_NO_CAST_FROM_ASCII
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
PkgConfig::ATSPI2_nolink PkgConfig::ATSPI2_nolink
Qt::AccessibilitySupportPrivate
Qt::CorePrivate Qt::CorePrivate
Qt::DBus Qt::DBus
Qt::GuiPrivate Qt::GuiPrivate

2
src/platformsupport/linuxaccessibility/atspiadaptor.cpp
View File

@ -50,7 +50,7 @@
#ifndef QT_NO_ACCESSIBILITY #ifndef QT_NO_ACCESSIBILITY
#include "socket_interface.h" #include "socket_interface.h"
#include "constant_mappings_p.h" #include "constant_mappings_p.h"
#include <QtAccessibilitySupport/private/qaccessiblebridgeutils_p.h> #include <QtGui/private/qaccessiblebridgeutils_p.h>
#include "application_p.h" #include "application_p.h"
/*! /*!

2
src/platformsupport/linuxaccessibility/linuxaccessibility.pro
View File

@ -1,7 +1,7 @@
TARGET = QtLinuxAccessibilitySupport TARGET = QtLinuxAccessibilitySupport
MODULE = linuxaccessibility_support MODULE = linuxaccessibility_support
QT = core-private dbus gui-private accessibility_support-private QT = core-private dbus gui-private
CONFIG += static internal_module CONFIG += static internal_module
DEFINES += QT_NO_CAST_FROM_ASCII DEFINES += QT_NO_CAST_FROM_ASCII

2
src/platformsupport/platformsupport.pro
View File

@ -27,10 +27,8 @@ qtConfig(kms): \
SUBDIRS += kmsconvenience SUBDIRS += kmsconvenience
qtConfig(accessibility) { qtConfig(accessibility) {
SUBDIRS += accessibility
qtConfig(accessibility-atspi-bridge) { qtConfig(accessibility-atspi-bridge) {
SUBDIRS += linuxaccessibility SUBDIRS += linuxaccessibility
linuxaccessibility.depends += accessibility
} }
} }

1
src/plugins/platforms/android/CMakeLists.txt
View File

@ -44,7 +44,6 @@ qt_internal_add_plugin(QAndroidIntegrationPlugin
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${QT_SOURCE_TREE}/src/3rdparty/android ${QT_SOURCE_TREE}/src/3rdparty/android
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::AccessibilitySupportPrivate
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate
Qt::EglSupportPrivate Qt::EglSupportPrivate

2
src/plugins/platforms/android/android.pro
View File

@ -4,7 +4,7 @@ LIBS += -ljnigraphics -landroid
QT += \ QT += \
core-private gui-private \ core-private gui-private \
eventdispatcher_support-private accessibility_support-private \ eventdispatcher_support-private \
fontdatabase_support-private egl_support-private fontdatabase_support-private egl_support-private
qtConfig(opengl): QT += opengl-private qtConfig(opengl): QT += opengl-private

2
src/plugins/platforms/android/androidjniaccessibility.cpp
View File

@ -41,7 +41,7 @@
#include "androidjnimain.h" #include "androidjnimain.h"
#include "qandroidplatformintegration.h" #include "qandroidplatformintegration.h"
#include "qpa/qplatformaccessibility.h" #include "qpa/qplatformaccessibility.h"
#include <QtAccessibilitySupport/private/qaccessiblebridgeutils_p.h> #include <QtGui/private/qaccessiblebridgeutils_p.h>
#include "qguiapplication.h" #include "qguiapplication.h"
#include "qwindow.h" #include "qwindow.h"
#include "qrect.h" #include "qrect.h"

2
src/plugins/platforms/cocoa/CMakeLists.txt
View File

@ -104,8 +104,6 @@ qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_accessibility
SOURCES SOURCES
qcocoaaccessibility.h qcocoaaccessibility.mm qcocoaaccessibility.h qcocoaaccessibility.mm
qcocoaaccessibilityelement.h qcocoaaccessibilityelement.mm qcocoaaccessibilityelement.h qcocoaaccessibilityelement.mm
PUBLIC_LIBRARIES
Qt::AccessibilitySupportPrivate
) )
qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionmanager qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionmanager

1
src/plugins/platforms/cocoa/cocoa.pro
View File

@ -76,7 +76,6 @@ qtConfig(vulkan) {
} }
qtConfig(accessibility) { qtConfig(accessibility) {
QT += accessibility_support-private
SOURCES += qcocoaaccessibilityelement.mm \ SOURCES += qcocoaaccessibilityelement.mm \
qcocoaaccessibility.mm qcocoaaccessibility.mm
HEADERS += qcocoaaccessibilityelement.h \ HEADERS += qcocoaaccessibilityelement.h \

2
src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
View File

@ -43,7 +43,7 @@
#include "qcocoascreen.h" #include "qcocoascreen.h"
#include <QtGui/private/qaccessiblecache_p.h> #include <QtGui/private/qaccessiblecache_p.h>
#include <QtAccessibilitySupport/private/qaccessiblebridgeutils_p.h> #include <QtGui/private/qaccessiblebridgeutils_p.h>
#include <QtGui/qaccessible.h> #include <QtGui/qaccessible.h>
#import <AppKit/NSAccessibility.h> #import <AppKit/NSAccessibility.h>

2
src/plugins/platforms/direct2d/direct2d.pro
View File

@ -5,8 +5,6 @@ QT += \
eventdispatcher_support-private \ eventdispatcher_support-private \
fontdatabase_support-private theme_support-private fontdatabase_support-private theme_support-private
qtConfig(accessibility): QT += accessibility_support-private
LIBS += -ldwmapi -lversion -ld3d11 -ldxgi -ldxguid LIBS += -ldwmapi -lversion -ld3d11 -ldxgi -ldxguid
QMAKE_USE_PRIVATE += gdi32 dwrite_1 d2d1_1 QMAKE_USE_PRIVATE += gdi32 dwrite_1 d2d1_1

2
src/plugins/platforms/windows/CMakeLists.txt
View File

@ -115,8 +115,6 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility
uiautomation/qwindowsuiautils.cpp uiautomation/qwindowsuiautils.h uiautomation/qwindowsuiautils.cpp uiautomation/qwindowsuiautils.h
uiautomation/qwindowsuiavalueprovider.cpp uiautomation/qwindowsuiavalueprovider.h uiautomation/qwindowsuiavalueprovider.cpp uiautomation/qwindowsuiavalueprovider.h
uiautomation/qwindowsuiawindowprovider.cpp uiautomation/qwindowsuiawindowprovider.h uiautomation/qwindowsuiawindowprovider.cpp uiautomation/qwindowsuiawindowprovider.h
PUBLIC_LIBRARIES
Qt::AccessibilitySupportPrivate
) )
qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_directwrite3 qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_directwrite3

2
src/plugins/platforms/windows/windows.pro
View File

@ -7,8 +7,6 @@ QT += \
qtConfig(opengl): QT += opengl-private qtConfig(opengl): QT += opengl-private
qtConfig(accessibility): QT += accessibility_support-private
qtConfig(directwrite3): DEFINES *= QT_USE_DIRECTWRITE2 QT_USE_DIRECTWRITE3 qtConfig(directwrite3): DEFINES *= QT_USE_DIRECTWRITE2 QT_USE_DIRECTWRITE3
LIBS += -ldwmapi LIBS += -ldwmapi

1
sync.profile
View File

@ -11,7 +11,6 @@
"QtTest" => "$basedir/src/testlib", "QtTest" => "$basedir/src/testlib",
"QtDBus" => "$basedir/src/dbus", "QtDBus" => "$basedir/src/dbus",
"QtConcurrent" => "$basedir/src/concurrent", "QtConcurrent" => "$basedir/src/concurrent",
"QtAccessibilitySupport" => "$basedir/src/platformsupport/accessibility",
"QtLinuxAccessibilitySupport" => "$basedir/src/platformsupport/linuxaccessibility", "QtLinuxAccessibilitySupport" => "$basedir/src/platformsupport/linuxaccessibility",
"QtDeviceDiscoverySupport" => "$basedir/src/platformsupport/devicediscovery", "QtDeviceDiscoverySupport" => "$basedir/src/platformsupport/devicediscovery",
"QtEventDispatcherSupport" => "$basedir/src/platformsupport/eventdispatchers", "QtEventDispatcherSupport" => "$basedir/src/platformsupport/eventdispatchers",

1
tests/auto/other/qaccessibilitylinux/CMakeLists.txt
View File

@ -16,7 +16,6 @@ add_qt_test(tst_qaccessibilitylinux
DBUS_INTERFACE_SOURCES DBUS_INTERFACE_SOURCES
../../../../src/platformsupport/linuxaccessibility/dbusxml/Bus.xml ../../../../src/platformsupport/linuxaccessibility/dbusxml/Bus.xml
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::AccessibilitySupportPrivate
Qt::DBus Qt::DBus
Qt::Gui Qt::Gui
Qt::GuiPrivate Qt::GuiPrivate

2
tests/auto/other/qaccessibilitylinux/qaccessibilitylinux.pro
View File

@ -3,6 +3,6 @@ CONFIG += testcase
TARGET = tst_qaccessibilitylinux TARGET = tst_qaccessibilitylinux
SOURCES += tst_qaccessibilitylinux.cpp SOURCES += tst_qaccessibilitylinux.cpp
QT += gui-private widgets dbus testlib accessibility_support-private linuxaccessibility_support-private QT += gui-private widgets dbus testlib linuxaccessibility_support-private
DBUS_INTERFACES = $$PWD/../../../../src/platformsupport/linuxaccessibility/dbusxml/Bus.xml DBUS_INTERFACES = $$PWD/../../../../src/platformsupport/linuxaccessibility/dbusxml/Bus.xml

6
util/cmake/helper.py
View File

@ -76,12 +76,6 @@ class LibraryMapping:
_qt_library_map = [ _qt_library_map = [
# Qt: # Qt:
LibraryMapping(
"accessibility_support",
"Qt6",
"Qt::AccessibilitySupport",
extra=["COMPONENTS", "AccessibilitySupport"],
),
LibraryMapping( LibraryMapping(
"androidextras", "Qt6", "Qt::AndroidExtras", extra=["COMPONENTS", "AndroidExtras"] "androidextras", "Qt6", "Qt::AndroidExtras", extra=["COMPONENTS", "AndroidExtras"]
), ),