diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2020-06-05 09:24:37 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-06-06 20:25:49 +0200 |
| commit | 45b0f1be686cfba8dcecb9be5c875cae59c69276 (patch) | |
| tree | 363dfd46575d147206267d854ce14747157f432e /tests/auto/other/qaccessibility | |
| parent | aa81b90738ce9faee5e433617c8bd243cb238729 (diff) | |
Remove winrt
Macros and the await helper function from qfunctions_winrt(_p).h are
needed in other Qt modules which use UWP APIs on desktop windows.
Task-number: QTBUG-84434
Change-Id: Ice09c11436ad151c17bdccd2c7defadd08c13925
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'tests/auto/other/qaccessibility')
| -rw-r--r-- | tests/auto/other/qaccessibility/.prev_CMakeLists.txt | 6 | ||||
| -rw-r--r-- | tests/auto/other/qaccessibility/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | tests/auto/other/qaccessibility/tst_qaccessibility.cpp | 4 |
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); |