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 /src/plugins | |
| 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 'src/plugins')
4 files changed, 3 insertions, 6 deletions
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiaaccessibility.cpp b/src/plugins/platforms/windows/uiautomation/qwindowsuiaaccessibility.cpp index 93b9622655..0903f5a618 100644 --- a/src/plugins/platforms/windows/uiautomation/qwindowsuiaaccessibility.cpp +++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiaaccessibility.cpp @@ -50,7 +50,7 @@ #include <QtGui/private/qguiapplication_p.h> #include <QtCore/qt_windows.h> #include <qpa/qplatformintegration.h> -#include <QtWindowsUIAutomationSupport/private/qwindowsuiawrapper_p.h> +#include <QtGui/private/qwindowsuiawrapper_p.h> #include <QtCore/private/qwinregistry_p.h> diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiabaseprovider.h b/src/plugins/platforms/windows/uiautomation/qwindowsuiabaseprovider.h index a20df28e3f..a14eb8ca65 100644 --- a/src/plugins/platforms/windows/uiautomation/qwindowsuiabaseprovider.h +++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiabaseprovider.h @@ -47,7 +47,7 @@ #include <QtCore/qpointer.h> #include <qwindowscombase.h> -#include <QtWindowsUIAutomationSupport/private/qwindowsuiawrapper_p.h> +#include <QtGui/private/qwindowsuiawrapper_p.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiautils.h b/src/plugins/platforms/windows/uiautomation/qwindowsuiautils.h index 6a482f6c1c..0daef2ea63 100644 --- a/src/plugins/platforms/windows/uiautomation/qwindowsuiautils.h +++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiautils.h @@ -48,7 +48,7 @@ #include <QtGui/qaccessible.h> #include <QtGui/qwindow.h> #include <QtCore/qrect.h> -#include <QtWindowsUIAutomationSupport/private/qwindowsuiawrapper_p.h> +#include <QtGui/private/qwindowsuiawrapper_p.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/uiautomation/uiautomation.pri b/src/plugins/platforms/windows/uiautomation/uiautomation.pri index 1c4b018d1c..fd3ed1c6df 100644 --- a/src/plugins/platforms/windows/uiautomation/uiautomation.pri +++ b/src/plugins/platforms/windows/uiautomation/uiautomation.pri @@ -1,6 +1,3 @@ -qtHaveModule(windowsuiautomation_support-private): \ - QT += windowsuiautomation_support-private - SOURCES += \ $$PWD/qwindowsuiaaccessibility.cpp \ $$PWD/qwindowsuiaprovidercache.cpp \ |