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/directfb | |
| 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/directfb')
4 files changed, 2 insertions, 5 deletions
diff --git a/src/plugins/platforms/directfb/.prev_CMakeLists.txt b/src/plugins/platforms/directfb/.prev_CMakeLists.txt index 17d4dbe1f4..a9bac7c988 100644 --- a/src/plugins/platforms/directfb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/directfb/.prev_CMakeLists.txt @@ -22,7 +22,6 @@ qt_internal_add_plugin(QDirectFbIntegrationPlugin PkgConfig::DirectFB Qt::Core Qt::CorePrivate - Qt::FontDatabaseSupportPrivate Qt::Gui Qt::GuiPrivate Qt::ServiceSupportPrivate diff --git a/src/plugins/platforms/directfb/CMakeLists.txt b/src/plugins/platforms/directfb/CMakeLists.txt index a2bd0b5a1f..ce6e4af3a3 100644 --- a/src/plugins/platforms/directfb/CMakeLists.txt +++ b/src/plugins/platforms/directfb/CMakeLists.txt @@ -26,7 +26,6 @@ qt_internal_add_plugin(QDirectFbIntegrationPlugin PkgConfig::DirectFB Qt::Core Qt::CorePrivate - Qt::FontDatabaseSupportPrivate Qt::Gui Qt::GuiPrivate Qt::ServiceSupportPrivate diff --git a/src/plugins/platforms/directfb/directfb.pro b/src/plugins/platforms/directfb/directfb.pro index 13140a28b2..57195de551 100644 --- a/src/plugins/platforms/directfb/directfb.pro +++ b/src/plugins/platforms/directfb/directfb.pro @@ -2,8 +2,7 @@ TARGET = qdirectfb QT += \ core-private gui-private \ - service_support-private \ - fontdatabase_support-private + service_support-private QMAKE_USE += directfb diff --git a/src/plugins/platforms/directfb/qdirectfbintegration.cpp b/src/plugins/platforms/directfb/qdirectfbintegration.cpp index 9eaa4abd1a..393ce69c52 100644 --- a/src/plugins/platforms/directfb/qdirectfbintegration.cpp +++ b/src/plugins/platforms/directfb/qdirectfbintegration.cpp @@ -44,7 +44,7 @@ #include "qdirectfbcursor.h" #include "qdirectfbwindow.h" -#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h> +#include <QtGui/private/qgenericunixfontdatabase_p.h> #include <QtGui/private/qgenericunixeventdispatcher_p.h> #include <QtServiceSupport/private/qgenericunixservices_p.h> |