diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-03-31 12:25:48 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-05-27 14:42:59 +0200 |
| commit | da1b0d2d6a540e2a824bb0ac4154e0edaaf9ea45 (patch) | |
| tree | 6060109dcf6e97362250f4151cda79c07c4f8e38 /src/plugins | |
| parent | a64a0ce3317afa1ff633d1d08904c967dbc6ecad (diff) | |
Move FreeType font engine/database to QtGui
Task-number: QTBUG-83255
Change-Id: If6be7057d6bd25b34acd99e18658744161985ed0
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins')
4 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformfontdatabase.h b/src/plugins/platforms/android/qandroidplatformfontdatabase.h index 166a590698..691656d89d 100644 --- a/src/plugins/platforms/android/qandroidplatformfontdatabase.h +++ b/src/plugins/platforms/android/qandroidplatformfontdatabase.h @@ -40,7 +40,7 @@ #ifndef QANDROIDPLATFORMFONTDATABASE_H #define QANDROIDPLATFORMFONTDATABASE_H -#include <QtFontDatabaseSupport/private/qfreetypefontdatabase_p.h> +#include <QtGui/private/qfreetypefontdatabase_p.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp index 0c2c0d0b68..b1f07f0ac2 100644 --- a/src/plugins/platforms/minimal/qminimalintegration.cpp +++ b/src/plugins/platforms/minimal/qminimalintegration.cpp @@ -45,7 +45,7 @@ #include <qpa/qplatformwindow.h> #include <qpa/qwindowsysteminterface.h> -#include <QtFontDatabaseSupport/private/qfreetypefontdatabase_p.h> +#include <QtGui/private/qfreetypefontdatabase_p.h> #if defined(Q_OS_WINRT) # include <QtFontDatabaseSupport/private/qwinrtfontdatabase_p.h> #elif defined(Q_OS_WIN) @@ -63,7 +63,7 @@ #endif #if QT_CONFIG(freetype) -#include <QtFontDatabaseSupport/private/qfontengine_ft_p.h> +#include <QtGui/private/qfontengine_ft_p.h> #endif #if !defined(Q_OS_WIN) diff --git a/src/plugins/platforms/offscreen/qoffscreenintegration.cpp b/src/plugins/platforms/offscreen/qoffscreenintegration.cpp index 3a4494fc2e..4a27bc511d 100644 --- a/src/plugins/platforms/offscreen/qoffscreenintegration.cpp +++ b/src/plugins/platforms/offscreen/qoffscreenintegration.cpp @@ -50,7 +50,7 @@ #include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h> #endif #elif defined(Q_OS_WIN) -#include <QtFontDatabaseSupport/private/qfreetypefontdatabase_p.h> +#include <QtGui/private/qfreetypefontdatabase_p.h> #ifndef Q_OS_WINRT #include <QtCore/private/qeventdispatcher_win_p.h> #else diff --git a/src/plugins/platforms/wasm/qwasmfontdatabase.h b/src/plugins/platforms/wasm/qwasmfontdatabase.h index ce22ad14d7..420211947c 100644 --- a/src/plugins/platforms/wasm/qwasmfontdatabase.h +++ b/src/plugins/platforms/wasm/qwasmfontdatabase.h @@ -30,7 +30,7 @@ #ifndef QWASMFONTDATABASE_H #define QWASMFONTDATABASE_H -#include <QtFontDatabaseSupport/private/qfreetypefontdatabase_p.h> +#include <QtGui/private/qfreetypefontdatabase_p.h> QT_BEGIN_NAMESPACE |