diff options
| author | Andrew Knight <andrew.knight@digia.com> | 2014-01-06 22:41:17 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-07 10:55:30 +0100 |
| commit | a90972e8f88dbe6bd43a15559e12c26ec9ba646d (patch) | |
| tree | 541debbf6c4fe76d4aeecbbe4ef6359fc94503c8 | |
| parent | 153f82390dd977436000de5aae2fe8eb4a5d9936 (diff) | |
WinRT: Enable accessibility by default
While there is no implementation for accessibility yet, enabling it allows
the interfaces to be used and an accessibility plugin to be developed
for this platform.
IAccessible2 and MSAA bridge autotests are disabled for this platform.
Change-Id: I2bfd07f6b21ca469b27d88ef11df723ac8ff8202
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
| -rw-r--r-- | tests/auto/other/qaccessibility/qaccessibility.pro | 5 | ||||
| -rw-r--r-- | tests/auto/other/qaccessibility/tst_qaccessibility.cpp | 4 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/tests/auto/other/qaccessibility/qaccessibility.pro b/tests/auto/other/qaccessibility/qaccessibility.pro index 70f6633195..e6c5bb1149 100644 --- a/tests/auto/other/qaccessibility/qaccessibility.pro +++ b/tests/auto/other/qaccessibility/qaccessibility.pro @@ -13,10 +13,11 @@ wince*: { } win32 { - !*g++ { + !*g++:!winrt { include(../../../../src/3rdparty/iaccessible2/iaccessible2.pri) DEFINES += QT_SUPPORTS_IACCESSIBLE2 } - LIBS += -loleacc -loleaut32 -lole32 -luuid + LIBS += -luuid + !winphone: LIBS += -loleacc -loleaut32 -lole32 } DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp index 73bf4aab6a..dc3f266025 100644 --- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp +++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp @@ -43,7 +43,9 @@ #include <QtCore/qglobal.h> #ifdef Q_OS_WIN # include <QtCore/qt_windows.h> +#ifndef Q_OS_WINRT # include <oleacc.h> +#endif # include <servprov.h> # include <winuser.h> # ifdef QT_SUPPORTS_IACCESSIBLE2 @@ -3366,7 +3368,7 @@ void tst_QAccessibility::bridgeTest() { // For now this is a simple test to see if the bridge is working at all. // Ideally it should be extended to test all aspects of the bridge. -#ifdef Q_OS_WIN +#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) // First, test MSAA part of bridge QWidget *window = new QWidget; QVBoxLayout *lay = new QVBoxLayout(window); diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index e1295c6370..3ad9339f4f 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1600,7 +1600,6 @@ void Configure::applySpecSpecifics() dictionary[ "LIBJPEG" ] = "qt"; dictionary[ "LIBPNG" ] = "qt"; dictionary[ "FREETYPE" ] = "yes"; - dictionary[ "ACCESSIBILITY" ] = "no"; dictionary[ "OPENGL" ] = "yes"; dictionary[ "OPENGL_ES_2" ] = "yes"; dictionary[ "OPENVG" ] = "no"; |