Do not expose ATSPI as public dependency of QtGui

This was always a compile-only dependency and atspi includes are only
used in private headers. The atspi headers can never be a requirement
for consumers of QtGui.

In Qt5 this code was part of the QtLinuxAccessibilitySupport private
module, and for that module the atspi dependency was public. This only
affected users that explicitly instructed qmake to pull in the
linuxaccessibility_support-private module.

Task-number: QTBUG-86421
Change-Id: I23c6a1c466f86b2015dde13fca605fd26299c9db
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
bb10
Joerg Bornemann 2020-09-08 17:11:05 +02:00
parent 457cf10f7e
commit 0f4422113c
3 changed files with 3 additions and 3 deletions

View File

@ -422,7 +422,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_accessibility AND QT_FEATURE_accessibi
accessibility_adaptors
DBUS_INTERFACE_SOURCES
accessibility_interfaces
PUBLIC_LIBRARIES
LIBRARIES
PkgConfig::ATSPI2_nolink
)

View File

@ -525,7 +525,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_accessibility AND QT_FEATURE_accessibi
DBUS_INTERFACE_FLAGS
"-i" "QtGui/private/qspi_struct_marshallers_p.h"
# special case end
PUBLIC_LIBRARIES
LIBRARIES
PkgConfig::ATSPI2_nolink
)

View File

@ -24,4 +24,4 @@ SOURCES += \
accessible/linux/qspiapplicationadaptor.cpp \
accessible/linux/qspidbuscache.cpp
QMAKE_USE += atspi/nolink
QMAKE_USE_PRIVATE += atspi/nolink