diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-03-31 12:25:59 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-05-27 17:51:24 +0200 |
| commit | ce2bc0e2d5b1d647db1e1726ecd434cc8a55accf (patch) | |
| tree | 004e90f6cb9a79e76f82d248a3eb8951e6095161 /src/plugins/platforms/ios | |
| parent | cbb9c53704dca4fdaba75e1e1fd354cff058876b (diff) | |
Move CoreText font engine/database to QtGui
Task-number: QTBUG-83255
Change-Id: Id34ed1759fdebbb1d09e51009f0370736002167c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/plugins/platforms/ios')
| -rw-r--r-- | src/plugins/platforms/ios/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/ios/kernel.pro | 3 | ||||
| -rw-r--r-- | src/plugins/platforms/ios/qiosintegration.mm | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/ios/qiostheme.mm | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/src/plugins/platforms/ios/CMakeLists.txt b/src/plugins/platforms/ios/CMakeLists.txt index 3e41e7e9c7..e7925b5282 100644 --- a/src/plugins/platforms/ios/CMakeLists.txt +++ b/src/plugins/platforms/ios/CMakeLists.txt @@ -33,7 +33,6 @@ add_qt_plugin(QIOSIntegrationPlugin ${FWUIKit} Qt::Core Qt::CorePrivate - Qt::FontDatabaseSupportPrivate Qt::Gui Qt::GuiPrivate ) diff --git a/src/plugins/platforms/ios/kernel.pro b/src/plugins/platforms/ios/kernel.pro index 54c46208d8..859fa6e079 100644 --- a/src/plugins/platforms/ios/kernel.pro +++ b/src/plugins/platforms/ios/kernel.pro @@ -6,8 +6,7 @@ TARGET = qios qtConfig(shared): CONFIG += static QT += \ - core-private gui-private \ - fontdatabase_support-private + core-private gui-private qtHaveModule(platformcompositor_support-private): QT += platformcompositor_support-private diff --git a/src/plugins/platforms/ios/qiosintegration.mm b/src/plugins/platforms/ios/qiosintegration.mm index e9046151f5..3b01342b8e 100644 --- a/src/plugins/platforms/ios/qiosintegration.mm +++ b/src/plugins/platforms/ios/qiosintegration.mm @@ -59,7 +59,7 @@ #include <qoffscreensurface.h> #include <qpa/qplatformoffscreensurface.h> -#include <QtFontDatabaseSupport/private/qcoretextfontdatabase_p.h> +#include <QtGui/private/qcoretextfontdatabase_p.h> #include <QtGui/private/qmacmime_p.h> #include <QDir> #include <QOperatingSystemVersion> diff --git a/src/plugins/platforms/ios/qiostheme.mm b/src/plugins/platforms/ios/qiostheme.mm index 626fbb66fe..1360af9d76 100644 --- a/src/plugins/platforms/ios/qiostheme.mm +++ b/src/plugins/platforms/ios/qiostheme.mm @@ -46,7 +46,7 @@ #include <QtGui/QFont> #include <QtGui/private/qcoregraphics_p.h> -#include <QtFontDatabaseSupport/private/qcoretextfontdatabase_p.h> +#include <QtGui/private/qcoretextfontdatabase_p.h> #include <QtGui/private/qguiapplication_p.h> #include <qpa/qplatformintegration.h> |