diff options
Diffstat (limited to 'src/plugins/platforms/cocoa')
| -rw-r--r-- | src/plugins/platforms/cocoa/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/cocoa.pro | 3 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaintegration.h | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaintegration.mm | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoatheme.mm | 4 |
5 files changed, 5 insertions, 7 deletions
diff --git a/src/plugins/platforms/cocoa/CMakeLists.txt b/src/plugins/platforms/cocoa/CMakeLists.txt index 14244a6dac..ce4c245a17 100644 --- a/src/plugins/platforms/cocoa/CMakeLists.txt +++ b/src/plugins/platforms/cocoa/CMakeLists.txt @@ -58,7 +58,6 @@ qt_internal_add_plugin(QCocoaIntegrationPlugin Cups::Cups Qt::Core Qt::CorePrivate - Qt::FontDatabaseSupportPrivate Qt::Gui Qt::GuiPrivate Qt::ThemeSupportPrivate diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro index be75cf3f51..9bd95bbceb 100644 --- a/src/plugins/platforms/cocoa/cocoa.pro +++ b/src/plugins/platforms/cocoa/cocoa.pro @@ -96,8 +96,7 @@ DEFINES += QT_NO_FOREACH QT += \ core-private gui-private \ - theme_support-private \ - fontdatabase_support-private + theme_support-private qtHaveModule(platformcompositor_support-private): QT += platformcompositor_support-private diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.h b/src/plugins/platforms/cocoa/qcocoaintegration.h index 30838ba254..2fb16faca5 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.h +++ b/src/plugins/platforms/cocoa/qcocoaintegration.h @@ -57,7 +57,7 @@ #include <QtCore/QScopedPointer> #include <qpa/qplatformintegration.h> -#include <QtFontDatabaseSupport/private/qcoretextfontdatabase_p.h> +#include <QtGui/private/qcoretextfontdatabase_p.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm index 2d19809435..27e0bb5f30 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.mm +++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm @@ -66,7 +66,7 @@ #include <QtGui/private/qcoregraphics_p.h> -#include <QtFontDatabaseSupport/private/qfontengine_coretext_p.h> +#include <QtGui/private/qfontengine_coretext_p.h> #if QT_CONFIG(opengl) #include <QtPlatformCompositorSupport/qpa/qplatformbackingstoreopenglsupport.h> diff --git a/src/plugins/platforms/cocoa/qcocoatheme.mm b/src/plugins/platforms/cocoa/qcocoatheme.mm index d73b028afb..543348c7b6 100644 --- a/src/plugins/platforms/cocoa/qcocoatheme.mm +++ b/src/plugins/platforms/cocoa/qcocoatheme.mm @@ -56,8 +56,8 @@ #include <QtGui/private/qcoregraphics_p.h> #include <QtGui/qpainter.h> #include <QtGui/qtextformat.h> -#include <QtFontDatabaseSupport/private/qcoretextfontdatabase_p.h> -#include <QtFontDatabaseSupport/private/qfontengine_coretext_p.h> +#include <QtGui/private/qcoretextfontdatabase_p.h> +#include <QtGui/private/qfontengine_coretext_p.h> #include <QtThemeSupport/private/qabstractfileiconengine_p.h> #include <qpa/qplatformdialoghelper.h> #include <qpa/qplatformintegration.h> |