From c9e67a7926c2932217f6d484ea69219d077ef176 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Sat, 8 Feb 2020 11:17:24 +0100 Subject: CMake: Regenenerate projects where recent changes happened Change-Id: If86e49d73a45b7cfc494fa48bdc6cb1ba503b112 Reviewed-by: Simon Hausmann --- src/platformsupport/fontdatabases/.prev_CMakeLists.txt | 15 +++++++++++++-- src/platformsupport/fontdatabases/CMakeLists.txt | 15 +++++++++++++-- src/platformsupport/platformcompositor/CMakeLists.txt | 2 ++ 3 files changed, 28 insertions(+), 4 deletions(-) (limited to 'src/platformsupport') diff --git a/src/platformsupport/fontdatabases/.prev_CMakeLists.txt b/src/platformsupport/fontdatabases/.prev_CMakeLists.txt index ae7d22260c..56cf076bd9 100644 --- a/src/platformsupport/fontdatabases/.prev_CMakeLists.txt +++ b/src/platformsupport/fontdatabases/.prev_CMakeLists.txt @@ -67,6 +67,7 @@ qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_fontconfig qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT SOURCES windows/qwindowsfontdatabase.cpp windows/qwindowsfontdatabase_p.h + windows/qwindowsfontdatabasebase.cpp windows/qwindowsfontdatabasebase_p.h windows/qwindowsfontengine.cpp windows/qwindowsfontengine_p.h windows/qwindowsnativeimage.cpp windows/qwindowsnativeimage_p.h LIBRARIES @@ -90,14 +91,24 @@ qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATUR d2d1 ) -qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite2 AND WIN32 AND NOT WINRT +qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite3 AND WIN32 AND NOT WINRT + SOURCES + windows/qwindowsdirectwritefontdatabase.cpp windows/qwindowsdirectwritefontdatabase_p.h + DEFINES + QT_USE_DIRECTWRITE2 + QT_USE_DIRECTWRITE3 + LIBRARIES + dwrite_3 +) + +qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite2 AND WIN32 AND NOT QT_FEATURE_directwrite3 AND NOT WINRT DEFINES QT_USE_DIRECTWRITE2 LIBRARIES dwrite_2 ) -qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT QT_FEATURE_directwrite2 AND NOT WINRT +qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT QT_FEATURE_directwrite2 AND NOT QT_FEATURE_directwrite3 AND NOT WINRT LIBRARIES dwrite ) diff --git a/src/platformsupport/fontdatabases/CMakeLists.txt b/src/platformsupport/fontdatabases/CMakeLists.txt index dd836c1e6d..1150ac6bef 100644 --- a/src/platformsupport/fontdatabases/CMakeLists.txt +++ b/src/platformsupport/fontdatabases/CMakeLists.txt @@ -70,6 +70,7 @@ qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_fontconfig qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT SOURCES windows/qwindowsfontdatabase.cpp windows/qwindowsfontdatabase_p.h + windows/qwindowsfontdatabasebase.cpp windows/qwindowsfontdatabasebase_p.h windows/qwindowsfontengine.cpp windows/qwindowsfontengine_p.h windows/qwindowsnativeimage.cpp windows/qwindowsnativeimage_p.h LIBRARIES @@ -93,14 +94,24 @@ qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATUR d2d1 ) -qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite2 AND WIN32 AND NOT WINRT +qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite3 AND WIN32 AND NOT WINRT + SOURCES + windows/qwindowsdirectwritefontdatabase.cpp windows/qwindowsdirectwritefontdatabase_p.h + DEFINES + QT_USE_DIRECTWRITE2 + QT_USE_DIRECTWRITE3 + LIBRARIES + dwrite_3 +) + +qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite2 AND WIN32 AND NOT QT_FEATURE_directwrite3 AND NOT WINRT DEFINES QT_USE_DIRECTWRITE2 LIBRARIES dwrite_2 ) -qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT QT_FEATURE_directwrite2 AND NOT WINRT +qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT QT_FEATURE_directwrite2 AND NOT QT_FEATURE_directwrite3 AND NOT WINRT LIBRARIES dwrite ) diff --git a/src/platformsupport/platformcompositor/CMakeLists.txt b/src/platformsupport/platformcompositor/CMakeLists.txt index 8acba0503f..1ddc9e719d 100644 --- a/src/platformsupport/platformcompositor/CMakeLists.txt +++ b/src/platformsupport/platformcompositor/CMakeLists.txt @@ -10,11 +10,13 @@ qt_add_module(PlatformCompositorSupport SOURCES qopenglcompositor.cpp qopenglcompositor_p.h qopenglcompositorbackingstore.cpp qopenglcompositorbackingstore_p.h + qplatformbackingstoreopenglsupport.cpp qplatformbackingstoreopenglsupport.h DEFINES QT_NO_CAST_FROM_ASCII PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate + Qt::OpenGL ) #### Keys ignored in scope 1:.:.:platformcompositor.pro:: -- cgit v1.2.3