summaryrefslogtreecommitdiffstats
path: root/tests/auto/other/qaccessibility
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/other/qaccessibility')
-rw-r--r--tests/auto/other/qaccessibility/.prev_CMakeLists.txt6
-rw-r--r--tests/auto/other/qaccessibility/CMakeLists.txt6
-rw-r--r--tests/auto/other/qaccessibility/tst_qaccessibility.cpp4
3 files changed, 3 insertions, 13 deletions
diff --git a/tests/auto/other/qaccessibility/.prev_CMakeLists.txt b/tests/auto/other/qaccessibility/.prev_CMakeLists.txt
index 8663e412c4..7dea6c37e6 100644
--- a/tests/auto/other/qaccessibility/.prev_CMakeLists.txt
+++ b/tests/auto/other/qaccessibility/.prev_CMakeLists.txt
@@ -33,13 +33,9 @@ extend_target(tst_qaccessibility CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND
extend_target(tst_qaccessibility CONDITION WIN32
PUBLIC_LIBRARIES
+ Qt::WindowsUIAutomationSupportPrivate
ole32
oleacc
oleaut32
uuid
)
-
-extend_target(tst_qaccessibility CONDITION WIN32 AND NOT WINRT
- PUBLIC_LIBRARIES
- Qt::WindowsUIAutomationSupportPrivate
-)
diff --git a/tests/auto/other/qaccessibility/CMakeLists.txt b/tests/auto/other/qaccessibility/CMakeLists.txt
index f5f74bbafc..8a27fc25cc 100644
--- a/tests/auto/other/qaccessibility/CMakeLists.txt
+++ b/tests/auto/other/qaccessibility/CMakeLists.txt
@@ -39,13 +39,9 @@ extend_target(tst_qaccessibility CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND
extend_target(tst_qaccessibility CONDITION WIN32
PUBLIC_LIBRARIES
+ Qt::WindowsUIAutomationSupportPrivate
ole32
oleacc
oleaut32
uuid
)
-
-extend_target(tst_qaccessibility CONDITION WIN32 AND NOT WINRT
- PUBLIC_LIBRARIES
- Qt::WindowsUIAutomationSupportPrivate
-)
diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
index 339e7ad20d..07cccde0c8 100644
--- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
@@ -30,10 +30,8 @@
#include <QtCore/qglobal.h>
#ifdef Q_OS_WIN
# include <QtCore/qt_windows.h>
-#ifndef Q_OS_WINRT
# include <oleacc.h>
# include <QtGui/private/qwindowsuiawrapper_p.h>
-#endif
# include <servprov.h>
# include <winuser.h>
#endif
@@ -3774,7 +3772,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.
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
+#if defined(Q_OS_WIN)
QWidget window;
QVBoxLayout *lay = new QVBoxLayout(&window);