From 93a04332eb477e013a417f383df496b9a333ca7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 31 Mar 2020 15:56:40 +0200 Subject: Move QtAccessibilitySupport into QtGui MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-83255 Change-Id: Ibc1b38e77c3c90030a832c41f4de65c6c38bc91d Reviewed-by: Tor Arne Vestbø --- src/gui/CMakeLists.txt | 1 + src/gui/accessible/accessible.pri | 11 +- src/gui/accessible/qaccessiblebridgeutils.cpp | 113 +++++++++++++++++++++ src/gui/accessible/qaccessiblebridgeutils_p.h | 70 +++++++++++++ src/platformsupport/CMakeLists.txt | 3 - src/platformsupport/accessibility/CMakeLists.txt | 20 ---- .../accessibility/accessibility.pro | 15 --- .../accessibility/qaccessiblebridgeutils.cpp | 113 --------------------- .../accessibility/qaccessiblebridgeutils_p.h | 70 ------------- .../linuxaccessibility/CMakeLists.txt | 1 - .../linuxaccessibility/atspiadaptor.cpp | 2 +- .../linuxaccessibility/linuxaccessibility.pro | 2 +- src/platformsupport/platformsupport.pro | 2 - src/plugins/platforms/android/CMakeLists.txt | 1 - src/plugins/platforms/android/android.pro | 2 +- .../platforms/android/androidjniaccessibility.cpp | 2 +- src/plugins/platforms/cocoa/CMakeLists.txt | 2 - src/plugins/platforms/cocoa/cocoa.pro | 1 - .../platforms/cocoa/qcocoaaccessibilityelement.mm | 2 +- src/plugins/platforms/direct2d/direct2d.pro | 2 - src/plugins/platforms/windows/CMakeLists.txt | 2 - src/plugins/platforms/windows/windows.pro | 2 - sync.profile | 1 - .../auto/other/qaccessibilitylinux/CMakeLists.txt | 1 - .../qaccessibilitylinux/qaccessibilitylinux.pro | 2 +- util/cmake/helper.py | 6 -- 26 files changed, 196 insertions(+), 253 deletions(-) create mode 100644 src/gui/accessible/qaccessiblebridgeutils.cpp create mode 100644 src/gui/accessible/qaccessiblebridgeutils_p.h delete mode 100644 src/platformsupport/accessibility/CMakeLists.txt delete mode 100644 src/platformsupport/accessibility/accessibility.pro delete mode 100644 src/platformsupport/accessibility/qaccessiblebridgeutils.cpp delete mode 100644 src/platformsupport/accessibility/qaccessiblebridgeutils_p.h 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/gui/accessible/qaccessiblebridgeutils.cpp b/src/gui/accessible/qaccessiblebridgeutils.cpp new file mode 100644 index 0000000000..a15b93e31e --- /dev/null +++ b/src/gui/accessible/qaccessiblebridgeutils.cpp @@ -0,0 +1,113 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#include "qaccessiblebridgeutils_p.h" +#include + +QT_BEGIN_NAMESPACE + +namespace QAccessibleBridgeUtils { + +static bool performAction(QAccessibleInterface *iface, const QString &actionName) +{ + if (QAccessibleActionInterface *actionIface = iface->actionInterface()) { + if (actionIface->actionNames().contains(actionName)) { + actionIface->doAction(actionName); + return true; + } + } + return false; +} + +QStringList effectiveActionNames(QAccessibleInterface *iface) +{ + QStringList actions; + if (QAccessibleActionInterface *actionIface = iface->actionInterface()) + actions = actionIface->actionNames(); + + if (iface->valueInterface()) { + if (!actions.contains(QAccessibleActionInterface::increaseAction())) + actions << QAccessibleActionInterface::increaseAction(); + if (!actions.contains(QAccessibleActionInterface::decreaseAction())) + actions << QAccessibleActionInterface::decreaseAction(); + } + return actions; +} + +bool performEffectiveAction(QAccessibleInterface *iface, const QString &actionName) +{ + if (!iface) + return false; + if (performAction(iface, actionName)) + return true; + if (actionName != QAccessibleActionInterface::increaseAction() + && actionName != QAccessibleActionInterface::decreaseAction()) + return false; + + QAccessibleValueInterface *valueIface = iface->valueInterface(); + if (!valueIface) + return false; + bool success; + const QVariant currentVariant = valueIface->currentValue(); + double stepSize = valueIface->minimumStepSize().toDouble(&success); + if (!success || qFuzzyIsNull(stepSize)) { + const double min = valueIface->minimumValue().toDouble(&success); + if (!success) + return false; + const double max = valueIface->maximumValue().toDouble(&success); + if (!success) + return false; + stepSize = (max - min) / 10; // this is pretty arbitrary, we just need to provide something + const int typ = currentVariant.userType(); + if (typ != QMetaType::Float && typ != QMetaType::Double) { + // currentValue is an integer. Round it up to ensure stepping in case it was below 1 + stepSize = qCeil(stepSize); + } + } + const double current = currentVariant.toDouble(&success); + if (!success) + return false; + if (actionName == QAccessibleActionInterface::decreaseAction()) + stepSize = -stepSize; + valueIface->setCurrentValue(current + stepSize); + return true; +} + +} //namespace + +QT_END_NAMESPACE diff --git a/src/gui/accessible/qaccessiblebridgeutils_p.h b/src/gui/accessible/qaccessiblebridgeutils_p.h new file mode 100644 index 0000000000..f34fcc5816 --- /dev/null +++ b/src/gui/accessible/qaccessiblebridgeutils_p.h @@ -0,0 +1,70 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QACCESSIBLEBRIDGEUTILS_H +#define QACCESSIBLEBRIDGEUTILS_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists for the convenience +// of other Qt classes. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include + +#include +#include + +QT_REQUIRE_CONFIG(accessibility); + +QT_BEGIN_NAMESPACE + +namespace QAccessibleBridgeUtils { + Q_GUI_EXPORT QStringList effectiveActionNames(QAccessibleInterface *iface); + Q_GUI_EXPORT bool performEffectiveAction(QAccessibleInterface *iface, const QString &actionName); +} + +QT_END_NAMESPACE + +#endif //QACCESSIBLEBRIDGEUTILS_H 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:: -# 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/accessibility/qaccessiblebridgeutils.cpp b/src/platformsupport/accessibility/qaccessiblebridgeutils.cpp deleted file mode 100644 index a15b93e31e..0000000000 --- a/src/platformsupport/accessibility/qaccessiblebridgeutils.cpp +++ /dev/null @@ -1,113 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#include "qaccessiblebridgeutils_p.h" -#include - -QT_BEGIN_NAMESPACE - -namespace QAccessibleBridgeUtils { - -static bool performAction(QAccessibleInterface *iface, const QString &actionName) -{ - if (QAccessibleActionInterface *actionIface = iface->actionInterface()) { - if (actionIface->actionNames().contains(actionName)) { - actionIface->doAction(actionName); - return true; - } - } - return false; -} - -QStringList effectiveActionNames(QAccessibleInterface *iface) -{ - QStringList actions; - if (QAccessibleActionInterface *actionIface = iface->actionInterface()) - actions = actionIface->actionNames(); - - if (iface->valueInterface()) { - if (!actions.contains(QAccessibleActionInterface::increaseAction())) - actions << QAccessibleActionInterface::increaseAction(); - if (!actions.contains(QAccessibleActionInterface::decreaseAction())) - actions << QAccessibleActionInterface::decreaseAction(); - } - return actions; -} - -bool performEffectiveAction(QAccessibleInterface *iface, const QString &actionName) -{ - if (!iface) - return false; - if (performAction(iface, actionName)) - return true; - if (actionName != QAccessibleActionInterface::increaseAction() - && actionName != QAccessibleActionInterface::decreaseAction()) - return false; - - QAccessibleValueInterface *valueIface = iface->valueInterface(); - if (!valueIface) - return false; - bool success; - const QVariant currentVariant = valueIface->currentValue(); - double stepSize = valueIface->minimumStepSize().toDouble(&success); - if (!success || qFuzzyIsNull(stepSize)) { - const double min = valueIface->minimumValue().toDouble(&success); - if (!success) - return false; - const double max = valueIface->maximumValue().toDouble(&success); - if (!success) - return false; - stepSize = (max - min) / 10; // this is pretty arbitrary, we just need to provide something - const int typ = currentVariant.userType(); - if (typ != QMetaType::Float && typ != QMetaType::Double) { - // currentValue is an integer. Round it up to ensure stepping in case it was below 1 - stepSize = qCeil(stepSize); - } - } - const double current = currentVariant.toDouble(&success); - if (!success) - return false; - if (actionName == QAccessibleActionInterface::decreaseAction()) - stepSize = -stepSize; - valueIface->setCurrentValue(current + stepSize); - return true; -} - -} //namespace - -QT_END_NAMESPACE diff --git a/src/platformsupport/accessibility/qaccessiblebridgeutils_p.h b/src/platformsupport/accessibility/qaccessiblebridgeutils_p.h deleted file mode 100644 index cf8e126894..0000000000 --- a/src/platformsupport/accessibility/qaccessiblebridgeutils_p.h +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QACCESSIBLEBRIDGEUTILS_H -#define QACCESSIBLEBRIDGEUTILS_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists for the convenience -// of other Qt classes. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include - -#include -#include - -QT_REQUIRE_CONFIG(accessibility); - -QT_BEGIN_NAMESPACE - -namespace QAccessibleBridgeUtils { - QStringList effectiveActionNames(QAccessibleInterface *iface); - bool performEffectiveAction(QAccessibleInterface *iface, const QString &actionName); -} - -QT_END_NAMESPACE - -#endif //QACCESSIBLEBRIDGEUTILS_H 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 +#include #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 +#include #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 -#include +#include #include #import 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 diff --git a/sync.profile b/sync.profile index d14acbd7b5..6e94d55bc3 100644 --- a/sync.profile +++ b/sync.profile @@ -11,7 +11,6 @@ "QtTest" => "$basedir/src/testlib", "QtDBus" => "$basedir/src/dbus", "QtConcurrent" => "$basedir/src/concurrent", - "QtAccessibilitySupport" => "$basedir/src/platformsupport/accessibility", "QtLinuxAccessibilitySupport" => "$basedir/src/platformsupport/linuxaccessibility", "QtDeviceDiscoverySupport" => "$basedir/src/platformsupport/devicediscovery", "QtEventDispatcherSupport" => "$basedir/src/platformsupport/eventdispatchers", diff --git a/tests/auto/other/qaccessibilitylinux/CMakeLists.txt b/tests/auto/other/qaccessibilitylinux/CMakeLists.txt index ae6e7c4205..2785b93738 100644 --- a/tests/auto/other/qaccessibilitylinux/CMakeLists.txt +++ b/tests/auto/other/qaccessibilitylinux/CMakeLists.txt @@ -16,7 +16,6 @@ add_qt_test(tst_qaccessibilitylinux DBUS_INTERFACE_SOURCES ../../../../src/platformsupport/linuxaccessibility/dbusxml/Bus.xml PUBLIC_LIBRARIES - Qt::AccessibilitySupportPrivate Qt::DBus Qt::Gui Qt::GuiPrivate diff --git a/tests/auto/other/qaccessibilitylinux/qaccessibilitylinux.pro b/tests/auto/other/qaccessibilitylinux/qaccessibilitylinux.pro index a964df0e24..837ef8ad69 100644 --- a/tests/auto/other/qaccessibilitylinux/qaccessibilitylinux.pro +++ b/tests/auto/other/qaccessibilitylinux/qaccessibilitylinux.pro @@ -3,6 +3,6 @@ CONFIG += testcase TARGET = tst_qaccessibilitylinux 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 diff --git a/util/cmake/helper.py b/util/cmake/helper.py index 776158a317..011ece0b8f 100644 --- a/util/cmake/helper.py +++ b/util/cmake/helper.py @@ -76,12 +76,6 @@ class LibraryMapping: _qt_library_map = [ # Qt: - LibraryMapping( - "accessibility_support", - "Qt6", - "Qt::AccessibilitySupport", - extra=["COMPONENTS", "AccessibilitySupport"], - ), LibraryMapping( "androidextras", "Qt6", "Qt::AndroidExtras", extra=["COMPONENTS", "AndroidExtras"] ), -- cgit v1.2.3