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/linuxfb | |
| 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/linuxfb')
| -rw-r--r-- | src/plugins/platforms/linuxfb/.prev_CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/linuxfb/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/linuxfb/linuxfb.pro | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp | 2 |
4 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt b/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt index 0f9ca12581..caa3f03f5d 100644 --- a/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt @@ -17,7 +17,6 @@ qt_internal_add_plugin(QLinuxFbIntegrationPlugin Qt::Core Qt::CorePrivate Qt::FbSupportPrivate - Qt::FontDatabaseSupportPrivate Qt::Gui Qt::GuiPrivate Qt::ServiceSupportPrivate diff --git a/src/plugins/platforms/linuxfb/CMakeLists.txt b/src/plugins/platforms/linuxfb/CMakeLists.txt index 83bd976caf..fdfe076902 100644 --- a/src/plugins/platforms/linuxfb/CMakeLists.txt +++ b/src/plugins/platforms/linuxfb/CMakeLists.txt @@ -18,7 +18,6 @@ qt_internal_add_plugin(QLinuxFbIntegrationPlugin Qt::Core Qt::CorePrivate Qt::FbSupportPrivate - Qt::FontDatabaseSupportPrivate Qt::Gui Qt::GuiPrivate Qt::ServiceSupportPrivate diff --git a/src/plugins/platforms/linuxfb/linuxfb.pro b/src/plugins/platforms/linuxfb/linuxfb.pro index adc2108c1f..9af0956cf7 100644 --- a/src/plugins/platforms/linuxfb/linuxfb.pro +++ b/src/plugins/platforms/linuxfb/linuxfb.pro @@ -5,7 +5,7 @@ DEFINES += QT_NO_FOREACH QT += \ core-private gui-private \ service_support-private \ - fontdatabase_support-private fb_support-private + fb_support-private qtHaveModule(input_support-private): \ QT += input_support-private diff --git a/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp index 740f1b87a7..4940302d36 100644 --- a/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp +++ b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp @@ -43,7 +43,7 @@ #include "qlinuxfbdrmscreen.h" #endif -#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h> +#include <QtGui/private/qgenericunixfontdatabase_p.h> #include <QtServiceSupport/private/qgenericunixservices_p.h> #include <QtGui/private/qgenericunixeventdispatcher_p.h> |