diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-09-08 17:11:05 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-09-11 00:41:11 +0200 |
| commit | 0f4422113cec41f2f3544c03b91d8d6220dff360 (patch) | |
| tree | 2f0681c197dfd1da485c299756e4c205ef27409d /src | |
| parent | 457cf10f7e0d91dd23dd499f6b70f0224e35e8be (diff) | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/.prev_CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/gui/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/gui/accessible/linux/linux.pri | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt index 9bbb208177..65780b44cf 100644 --- a/src/gui/.prev_CMakeLists.txt +++ b/src/gui/.prev_CMakeLists.txt @@ -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 ) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 271e9d0de9..1804991a7a 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -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 ) diff --git a/src/gui/accessible/linux/linux.pri b/src/gui/accessible/linux/linux.pri index 43e59cb7bc..928a96e62a 100644 --- a/src/gui/accessible/linux/linux.pri +++ b/src/gui/accessible/linux/linux.pri @@ -24,4 +24,4 @@ SOURCES += \ accessible/linux/qspiapplicationadaptor.cpp \ accessible/linux/qspidbuscache.cpp -QMAKE_USE += atspi/nolink +QMAKE_USE_PRIVATE += atspi/nolink |