diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-10 13:03:35 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-10 19:58:19 +0200 |
| commit | 7ec12b2902cc84a85ac6fe05ea98f76efa214344 (patch) | |
| tree | 41886bbf1a68878c3c93d35a05f8c0d94027e0b3 /src/plugins/platforms/android | |
| parent | 732c670590ae87b549ef0377d918bcb05e25fae4 (diff) | |
Move the UNIX event dispatchers into QtGui
Task-number: QTBUG-83255
Change-Id: I7d32eb1ec01784c9ed6bf5fc4913ffc5b3a34a49
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins/platforms/android')
4 files changed, 1 insertions, 5 deletions
diff --git a/src/plugins/platforms/android/.prev_CMakeLists.txt b/src/plugins/platforms/android/.prev_CMakeLists.txt index 9a3b8cc1bb..40c1374de1 100644 --- a/src/plugins/platforms/android/.prev_CMakeLists.txt +++ b/src/plugins/platforms/android/.prev_CMakeLists.txt @@ -43,11 +43,9 @@ qt_internal_add_plugin(QAndroidIntegrationPlugin ${CMAKE_CURRENT_SOURCE_DIR} ${QT_SOURCE_TREE}/src/3rdparty/android PUBLIC_LIBRARIES - Qt::AccessibilitySupportPrivate Qt::Core Qt::CorePrivate Qt::EglSupportPrivate - Qt::EventDispatcherSupportPrivate Qt::Gui Qt::GuiPrivate android diff --git a/src/plugins/platforms/android/CMakeLists.txt b/src/plugins/platforms/android/CMakeLists.txt index 8365be32cb..bb936085ee 100644 --- a/src/plugins/platforms/android/CMakeLists.txt +++ b/src/plugins/platforms/android/CMakeLists.txt @@ -47,7 +47,6 @@ qt_internal_add_plugin(QAndroidIntegrationPlugin Qt::Core Qt::CorePrivate Qt::EglSupportPrivate - Qt::EventDispatcherSupportPrivate Qt::Gui Qt::GuiPrivate android diff --git a/src/plugins/platforms/android/android.pro b/src/plugins/platforms/android/android.pro index 8312fba85d..29a6012dbf 100644 --- a/src/plugins/platforms/android/android.pro +++ b/src/plugins/platforms/android/android.pro @@ -4,7 +4,6 @@ LIBS += -ljnigraphics -landroid QT += \ core-private gui-private \ - eventdispatcher_support-private \ egl_support-private qtConfig(opengl): QT += opengl-private diff --git a/src/plugins/platforms/android/qandroideventdispatcher.h b/src/plugins/platforms/android/qandroideventdispatcher.h index 4fdd7af7a5..82d414d49a 100644 --- a/src/plugins/platforms/android/qandroideventdispatcher.h +++ b/src/plugins/platforms/android/qandroideventdispatcher.h @@ -42,7 +42,7 @@ #include <QtCore/QMutex> #include <QtCore/QSemaphore> -#include <QtEventDispatcherSupport/private/qunixeventdispatcher_qpa_p.h> +#include <QtGui/private/qunixeventdispatcher_qpa_p.h> class QAndroidEventDispatcher : public QUnixEventDispatcherQPA { |