diff options
author | Paul Olav Tvete <paul.tvete@qt.io> | 2017-02-14 13:31:37 +0100 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@qt.io> | 2017-02-20 08:30:07 +0000 |
commit | 7057b19b89e164f1698b72a338e532b935e199e9 (patch) | |
tree | 8ef14d47940654061f21ea73031d56f9e85f0cc5 /src/testlib/qtestaccessible.h | |
parent | 5f80a7956e1b884c7ce7f5102185a052c84d2056 (diff) |
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>
Diffstat (limited to 'src/testlib/qtestaccessible.h')
-rw-r--r-- | src/testlib/qtestaccessible.h | 6 |
1 files changed, 3 insertions, 3 deletions
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 |