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/vnc | |
| 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/vnc')
| -rw-r--r-- | src/plugins/platforms/vnc/.prev_CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/vnc/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/vnc/qvncintegration.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/vnc/vnc.pro | 2 |
4 files changed, 2 insertions, 5 deletions
diff --git a/src/plugins/platforms/vnc/.prev_CMakeLists.txt b/src/plugins/platforms/vnc/.prev_CMakeLists.txt index 092ab79d5c..4131d71c1f 100644 --- a/src/plugins/platforms/vnc/.prev_CMakeLists.txt +++ b/src/plugins/platforms/vnc/.prev_CMakeLists.txt @@ -18,14 +18,12 @@ qt_internal_add_plugin(QVncIntegrationPlugin PUBLIC_LIBRARIES Qt::Core Qt::CorePrivate - Qt::EventDispatcherSupportPrivate Qt::FbSupportPrivate Qt::FontDatabaseSupportPrivate Qt::Gui Qt::GuiPrivate Qt::Network Qt::ServiceSupportPrivate - Qt::ThemeSupportPrivate ) #### Keys ignored in scope 1:.:.:vnc.pro:<TRUE>: diff --git a/src/plugins/platforms/vnc/CMakeLists.txt b/src/plugins/platforms/vnc/CMakeLists.txt index e33e5c603f..a3870b5569 100644 --- a/src/plugins/platforms/vnc/CMakeLists.txt +++ b/src/plugins/platforms/vnc/CMakeLists.txt @@ -19,7 +19,6 @@ qt_internal_add_plugin(QVncIntegrationPlugin PUBLIC_LIBRARIES Qt::Core Qt::CorePrivate - Qt::EventDispatcherSupportPrivate Qt::FbSupportPrivate Qt::FontDatabaseSupportPrivate Qt::Gui diff --git a/src/plugins/platforms/vnc/qvncintegration.cpp b/src/plugins/platforms/vnc/qvncintegration.cpp index c7a796464a..09ee88cd89 100644 --- a/src/plugins/platforms/vnc/qvncintegration.cpp +++ b/src/plugins/platforms/vnc/qvncintegration.cpp @@ -43,7 +43,7 @@ #include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h> #include <QtServiceSupport/private/qgenericunixservices_p.h> -#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h> +#include <QtGui/private/qgenericunixeventdispatcher_p.h> #include <QtFbSupport/private/qfbbackingstore_p.h> #include <QtFbSupport/private/qfbwindow_p.h> diff --git a/src/plugins/platforms/vnc/vnc.pro b/src/plugins/platforms/vnc/vnc.pro index 7b50143fd7..fabbaea71f 100644 --- a/src/plugins/platforms/vnc/vnc.pro +++ b/src/plugins/platforms/vnc/vnc.pro @@ -3,7 +3,7 @@ TARGET = qvnc QT += \ core-private network gui-private \ service_support-private fb_support-private \ - eventdispatcher_support-private fontdatabase_support-private + fontdatabase_support-private qtHaveModule(input_support-private): \ QT += input_support-private |