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/offscreen | |
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/offscreen')
4 files changed, 3 insertions, 15 deletions
diff --git a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt index 6ca250161f..68abfbdea5 100644 --- a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt +++ b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt @@ -27,11 +27,6 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QOffscreenIntegrationPlugin CONDITION UNIX AND NOT APPLE - PUBLIC_LIBRARIES - Qt::FontDatabaseSupportPrivate -) - qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2 SOURCES qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h @@ -39,5 +34,5 @@ qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_ Qt::GlxSupportPrivate ) -#### Keys ignored in scope 4:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: +#### Keys ignored in scope 3:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" diff --git a/src/plugins/platforms/offscreen/CMakeLists.txt b/src/plugins/platforms/offscreen/CMakeLists.txt index a798344238..52d2b829d8 100644 --- a/src/plugins/platforms/offscreen/CMakeLists.txt +++ b/src/plugins/platforms/offscreen/CMakeLists.txt @@ -28,11 +28,6 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QOffscreenIntegrationPlugin CONDITION UNIX AND NOT APPLE - PUBLIC_LIBRARIES - Qt::FontDatabaseSupportPrivate -) - qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2 SOURCES qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h @@ -40,5 +35,5 @@ qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_ Qt::GlxSupportPrivate ) -#### Keys ignored in scope 4:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: +#### Keys ignored in scope 3:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" diff --git a/src/plugins/platforms/offscreen/offscreen.pro b/src/plugins/platforms/offscreen/offscreen.pro index 4bdbf7224a..5683b5e8ce 100644 --- a/src/plugins/platforms/offscreen/offscreen.pro +++ b/src/plugins/platforms/offscreen/offscreen.pro @@ -3,8 +3,6 @@ TARGET = qoffscreen QT += \ core-private gui-private -!darwin:!win32: QT += fontdatabase_support-private - DEFINES += QT_NO_FOREACH SOURCES = main.cpp \ diff --git a/src/plugins/platforms/offscreen/qoffscreenintegration.cpp b/src/plugins/platforms/offscreen/qoffscreenintegration.cpp index 7d2d585194..ef0eb7e9cf 100644 --- a/src/plugins/platforms/offscreen/qoffscreenintegration.cpp +++ b/src/plugins/platforms/offscreen/qoffscreenintegration.cpp @@ -47,7 +47,7 @@ #include <qpa/qplatformfontdatabase.h> #include <QtGui/private/qcoretextfontdatabase_p.h> #else -#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h> +#include <QtGui/private/qgenericunixfontdatabase_p.h> #endif #elif defined(Q_OS_WIN) #include <QtGui/private/qfreetypefontdatabase_p.h> |