diff options
| -rw-r--r-- | configure.json | 11 | ||||
| -rw-r--r-- | src/gui/configure.json | 7 | ||||
| -rw-r--r-- | src/testlib/qtestaccessible.h | 6 |
3 files changed, 10 insertions, 14 deletions
diff --git a/configure.json b/configure.json index 276bb095e5..987fabc2ea 100644 --- a/configure.json +++ b/configure.json @@ -56,7 +56,6 @@ "android-sdk": "string", "android-toolchain-version": "string", - "accessibility": "boolean", "android-style-assets": "boolean", "appstore-compliant": "boolean", "avx": "boolean", @@ -915,10 +914,6 @@ "condition": "config.qnx && tests.stack_protector", "output": [ "publicQtConfig" ] }, - "accessibility": { - "label": "Accessibility", - "output": [ "publicFeature", "feature" ] - }, "system-zlib": { "label": "Using system zlib", "condition": "libs.zlib", @@ -1081,11 +1076,6 @@ or compile needed modules into the library." Configure with '-qreal float' to create a build that is binary-compatible with 5.1." }, { - "type": "warning", - "condition": "!features.accessibility", - "message": "Accessibility disabled. This configuration of Qt is unsupported." - }, - { "type": "error", "condition": "!features.stl", "message": "Qt requires a compliant STL library." @@ -1191,7 +1181,6 @@ Configure with '-qreal float' to create a build that is binary-compatible with 5 }, { "section": "Support enabled for", "entries": [ - "accessibility", "pkg-config", "qml-debug", "libudev", diff --git a/src/gui/configure.json b/src/gui/configure.json index 08e50db906..52ccb60024 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -7,6 +7,7 @@ "commandline": { "options": { + "accessibility": "boolean", "angle": "boolean", "direct2d": "boolean", "directfb": "boolean", @@ -1042,6 +1043,11 @@ Specify -opengl desktop to use regular OpenGL." "message": "The OpenGL functionality tests failed! You might need to modify the include and library search paths by editing QMAKE_INCDIR_OPENGL[_ES2], QMAKE_LIBDIR_OPENGL[_ES2] and QMAKE_LIBS_OPENGL[_ES2] in the mkspec for your platform." + }, + { + "type": "warning", + "condition": "!features.accessibility", + "message": "Accessibility disabled. This configuration of Qt is unsupported." } ], @@ -1049,6 +1055,7 @@ QMAKE_LIBDIR_OPENGL[_ES2] and QMAKE_LIBS_OPENGL[_ES2] in the mkspec for your pla { "section": "Qt Gui", "entries": [ + "accessibility", "freetype", "system-freetype", "harfbuzz", 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 |