diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-28 08:20:55 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-11 19:38:09 +0200 |
| commit | b3e0732740d8fdace82d91973dac87261402604f (patch) | |
| tree | b5e4e607959c2db78d972a43bd3640d0f29c0942 /src/plugins/platforms/offscreen | |
| parent | 84f279259713e60449ecf787babb6bdcadc16bea (diff) | |
Move windows font databases into QtGui
Requires adapting a few config checks since cmake currently
does not detect directwrite.
Task-number: QTBUG-83255
Task-number: QTBUG-83931
Change-Id: I521f1924f701260b41dccbcecf87b19f08df5ccc
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/plugins/platforms/offscreen')
| -rw-r--r-- | src/plugins/platforms/offscreen/.prev_CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/offscreen/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/offscreen/offscreen.pro | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt index a8643961d3..6ca250161f 100644 --- a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt +++ b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt @@ -27,7 +27,7 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QOffscreenIntegrationPlugin CONDITION NOT APPLE +qt_extend_target(QOffscreenIntegrationPlugin CONDITION UNIX AND NOT APPLE PUBLIC_LIBRARIES Qt::FontDatabaseSupportPrivate ) diff --git a/src/plugins/platforms/offscreen/CMakeLists.txt b/src/plugins/platforms/offscreen/CMakeLists.txt index 59bfb19fc9..a798344238 100644 --- a/src/plugins/platforms/offscreen/CMakeLists.txt +++ b/src/plugins/platforms/offscreen/CMakeLists.txt @@ -28,7 +28,7 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QOffscreenIntegrationPlugin CONDITION NOT APPLE +qt_extend_target(QOffscreenIntegrationPlugin CONDITION UNIX AND NOT APPLE PUBLIC_LIBRARIES Qt::FontDatabaseSupportPrivate ) diff --git a/src/plugins/platforms/offscreen/offscreen.pro b/src/plugins/platforms/offscreen/offscreen.pro index 0d6faf08a4..4bdbf7224a 100644 --- a/src/plugins/platforms/offscreen/offscreen.pro +++ b/src/plugins/platforms/offscreen/offscreen.pro @@ -3,7 +3,7 @@ TARGET = qoffscreen QT += \ core-private gui-private -!darwin: QT += fontdatabase_support-private +!darwin:!win32: QT += fontdatabase_support-private DEFINES += QT_NO_FOREACH |