diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-15 10:54:00 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-18 12:02:26 +0200 |
| commit | 7e83f09eadc54fb3a9ae89598a42b7dc0aa2828c (patch) | |
| tree | ba2413b432a83a0ad1151026840e746bf332df37 /src/plugins/platforms/vnc | |
| parent | ab01885e48873fb2ad71841a3f1627fe4d9cd835 (diff) | |
Move UNIX services into QtGui
Task-number: QTBUG-83255
Change-Id: I95cd25c6e18ffb46955acc76d6cab551d1c8f5ae
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 | 1 | ||||
| -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, 4 deletions
diff --git a/src/plugins/platforms/vnc/.prev_CMakeLists.txt b/src/plugins/platforms/vnc/.prev_CMakeLists.txt index ebe1cd62d4..ab11e57f0d 100644 --- a/src/plugins/platforms/vnc/.prev_CMakeLists.txt +++ b/src/plugins/platforms/vnc/.prev_CMakeLists.txt @@ -22,7 +22,6 @@ qt_internal_add_plugin(QVncIntegrationPlugin Qt::Gui Qt::GuiPrivate Qt::Network - Qt::ServiceSupportPrivate ) #### 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 6347030b34..5024459cf4 100644 --- a/src/plugins/platforms/vnc/CMakeLists.txt +++ b/src/plugins/platforms/vnc/CMakeLists.txt @@ -23,7 +23,6 @@ qt_internal_add_plugin(QVncIntegrationPlugin Qt::Gui Qt::GuiPrivate Qt::Network - Qt::ServiceSupportPrivate ) #### Keys ignored in scope 1:.:.:vnc.pro:<TRUE>: diff --git a/src/plugins/platforms/vnc/qvncintegration.cpp b/src/plugins/platforms/vnc/qvncintegration.cpp index 6a0cc79402..9836839274 100644 --- a/src/plugins/platforms/vnc/qvncintegration.cpp +++ b/src/plugins/platforms/vnc/qvncintegration.cpp @@ -42,7 +42,7 @@ #include "qvnc_p.h" #include <QtGui/private/qgenericunixfontdatabase_p.h> -#include <QtServiceSupport/private/qgenericunixservices_p.h> +#include <QtGui/private/qgenericunixservices_p.h> #include <QtGui/private/qgenericunixeventdispatcher_p.h> #include <QtFbSupport/private/qfbbackingstore_p.h> diff --git a/src/plugins/platforms/vnc/vnc.pro b/src/plugins/platforms/vnc/vnc.pro index c679b114ab..a250ba999e 100644 --- a/src/plugins/platforms/vnc/vnc.pro +++ b/src/plugins/platforms/vnc/vnc.pro @@ -2,7 +2,7 @@ TARGET = qvnc QT += \ core-private network gui-private \ - service_support-private fb_support-private + fb_support-private qtHaveModule(input_support-private): \ QT += input_support-private |