summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Rosenkränzer <bero@linaro.org>2017-06-30 17:39:01 +0200
committerFrederik Gladhorn <frederik.gladhorn@qt.io>2017-07-03 07:44:31 +0000
commit386af91c57948b88ba98cb040430e4a3878e3e3b (patch)
tree6998276096b6307030feb9f8e6f1298c11df2657
parent989b9da3007ff06c79ab7ee553acfce9177df5b6 (diff)
Fix detection of AT-SPI
Building qtbase 5.9.1 on Linux always results in a build with accessibility support disabled. The problem is that the config option for accessibility-atspi-bridge checks for config.atspi, which isn't defined anywhere - it should check for libs.atspi (which is set if pkg-config finds atspi-2) instead. [ChangeLog][QtGui][Platform Specific Changes][Linux/XCB] Fixed detection of AT-SPI, allowing accessibility support to be built again. Task-number: QTBUG-61731 Change-Id: If3bd5dfccda40158c566f8507e34b6877b59b6fb Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Bernhard Rosenkränzer <bero@lindev.ch>
-rw-r--r--src/gui/configure.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json
index a2a78aa071..ef7ba51c38 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -434,7 +434,7 @@
"features": {
"accessibility-atspi-bridge": {
"label": "ATSPI Bridge",
- "condition": "features.accessibility && features.xcb && features.dbus && config.atspi",
+ "condition": "features.accessibility && features.xcb && features.dbus && libs.atspi",
"output": [ "privateFeature", "feature" ]
},
"angle": {