From 7057b19b89e164f1698b72a338e532b935e199e9 Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@qt.io>
Date: Tue, 14 Feb 2017 13:31:37 +0100
Subject: Only define "accessibility" feature once

The "accessibility" feature was defined globally for qtbase, but also
in src/gui. The definitions could end up with different values.

Change-Id: I1a932c3c04a5fc26b9f67eb4f5ff02e524f380e7
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/testlib/qtestaccessible.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/testlib')

diff --git a/src/testlib/qtestaccessible.h b/src/testlib/qtestaccessible.h
index c4c79b7deb..464f87fb5c 100644
--- a/src/testlib/qtestaccessible.h
+++ b/src/testlib/qtestaccessible.h
@@ -47,8 +47,6 @@
 
 #include <QtCore/qglobal.h>
 
-#ifndef QT_NO_ACCESSIBILITY
-
 #define QVERIFY_EVENT(event) \
     QVERIFY(QTestAccessibility::verifyEvent(event))
 
@@ -59,6 +57,8 @@
 #include <QtTest/qtest_global.h>
 #include <QtTest/qtestsystem.h>
 
+#if QT_CONFIG(accessibility)
+
 QT_BEGIN_NAMESPACE
 
 
@@ -294,5 +294,5 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_ACCESSIBILITY
+#endif // QT_CONFIG(accessibility)
 #endif // QTESTACCESSIBLE_H
-- 
cgit v1.2.3