diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-25 14:04:55 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-27 22:28:41 +0200 |
commit | 9c31acbf47a6f3d11da30b56f2499493b70064bc (patch) | |
tree | 591b9a420321db9df94d886187d31e7d77a80cad /tests/auto/other | |
parent | 6a0995525d306a1fa224adcbcb9f0ae1fc7d01bd (diff) |
Move windowsuiautomation API support into QtGui
Task-number: QTBUG-83255
Change-Id: Ibface71931b6384494842ba9744d76f738c5ca85
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'tests/auto/other')
-rw-r--r-- | tests/auto/other/qaccessibility/qaccessibility.pro | 3 | ||||
-rw-r--r-- | tests/auto/other/qaccessibility/tst_qaccessibility.cpp | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/tests/auto/other/qaccessibility/qaccessibility.pro b/tests/auto/other/qaccessibility/qaccessibility.pro index 6f3740a24f..65fdbdc103 100644 --- a/tests/auto/other/qaccessibility/qaccessibility.pro +++ b/tests/auto/other/qaccessibility/qaccessibility.pro @@ -8,9 +8,6 @@ HEADERS += accessiblewidgets.h unix:!darwin:!haiku:!integity: LIBS += -lm win32 { - !winrt { - QT += windowsuiautomation_support-private - } LIBS += -loleacc -loleaut32 QMAKE_USE += ole32 uuid } diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp index 2a2d4591a1..339e7ad20d 100644 --- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp +++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp @@ -32,7 +32,7 @@ # include <QtCore/qt_windows.h> #ifndef Q_OS_WINRT # include <oleacc.h> -# include <QtWindowsUIAutomationSupport/private/qwindowsuiawrapper_p.h> +# include <QtGui/private/qwindowsuiawrapper_p.h> #endif # include <servprov.h> # include <winuser.h> @@ -3827,8 +3827,10 @@ void tst_QAccessibility::bridgeTest() QVERIFY(SUCCEEDED(hr)); // Get UI Automation interface. + const GUID CLSID_CUIAutomation_test{0xff48dba4, 0x60ef, 0x4201, + {0xaa,0x87, 0x54,0x10,0x3e,0xef,0x59,0x4e}}; IUIAutomation *automation = nullptr; - hr = CoCreateInstance(CLSID_CUIAutomation, nullptr, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&automation)); + hr = CoCreateInstance(CLSID_CUIAutomation_test, nullptr, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&automation)); QVERIFY(SUCCEEDED(hr)); // Get button element from UI Automation using point. |