diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-12 07:38:54 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-15 11:34:26 +0200 |
| commit | 6be9830d865be32f224e15d13ddefd9c7e176553 (patch) | |
| tree | 8938ff202f53f3ad0f4e8facee84f0acdf9af093 /src/plugins/platforms/vnc | |
| parent | 927a82f5e0d0e8a174cbb027c58412e13f7067c5 (diff) | |
Move Unix font databases into QtGui
Task-number: QTBUG-83255
Change-Id: Id85a1e0f3de371951783fe97485158c4a02e1f15
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 | 3 |
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 4131d71c1f..ebe1cd62d4 100644 --- a/src/plugins/platforms/vnc/.prev_CMakeLists.txt +++ b/src/plugins/platforms/vnc/.prev_CMakeLists.txt @@ -19,7 +19,6 @@ qt_internal_add_plugin(QVncIntegrationPlugin Qt::Core Qt::CorePrivate Qt::FbSupportPrivate - Qt::FontDatabaseSupportPrivate Qt::Gui Qt::GuiPrivate Qt::Network diff --git a/src/plugins/platforms/vnc/CMakeLists.txt b/src/plugins/platforms/vnc/CMakeLists.txt index a3870b5569..6347030b34 100644 --- a/src/plugins/platforms/vnc/CMakeLists.txt +++ b/src/plugins/platforms/vnc/CMakeLists.txt @@ -20,7 +20,6 @@ qt_internal_add_plugin(QVncIntegrationPlugin Qt::Core Qt::CorePrivate Qt::FbSupportPrivate - Qt::FontDatabaseSupportPrivate Qt::Gui Qt::GuiPrivate Qt::Network diff --git a/src/plugins/platforms/vnc/qvncintegration.cpp b/src/plugins/platforms/vnc/qvncintegration.cpp index 09ee88cd89..6a0cc79402 100644 --- a/src/plugins/platforms/vnc/qvncintegration.cpp +++ b/src/plugins/platforms/vnc/qvncintegration.cpp @@ -41,7 +41,7 @@ #include "qvncscreen.h" #include "qvnc_p.h" -#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h> +#include <QtGui/private/qgenericunixfontdatabase_p.h> #include <QtServiceSupport/private/qgenericunixservices_p.h> #include <QtGui/private/qgenericunixeventdispatcher_p.h> diff --git a/src/plugins/platforms/vnc/vnc.pro b/src/plugins/platforms/vnc/vnc.pro index fabbaea71f..c679b114ab 100644 --- a/src/plugins/platforms/vnc/vnc.pro +++ b/src/plugins/platforms/vnc/vnc.pro @@ -2,8 +2,7 @@ TARGET = qvnc QT += \ core-private network gui-private \ - service_support-private fb_support-private \ - fontdatabase_support-private + service_support-private fb_support-private qtHaveModule(input_support-private): \ QT += input_support-private |