diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-29 11:03:49 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-15 20:58:35 +0200 |
| commit | b89d8c406b5809f868f1a06d9ab05096ecb226f3 (patch) | |
| tree | 6a3d072cc76769daf6914eb1fe906d6b9501fb11 /src/gui/CMakeLists.txt | |
| parent | f626c73b28b52ecf3a3fb20592f2134337f89d35 (diff) | |
Windows font databases: Enable DirectWrite for cmake
- Remove the DirectWrite1,2 features. Windows 10
should have them, only MinGW is missing directwrite3.
The feature directwrite now implies DirectWrite2.
- Remove the custom defines.
- Port over the configure tests from configure.json
and add missing ones for DirectWrite(2), DirectWrite3
and Direct2D and Direct2D 1.1, fix the conditions
and report them in the summary.
Task-number: QTBUG-83255
Fixes: QTBUG-83931
Change-Id: I1fc68997adc715bd5c6d7ec457f58c46e1f81c6a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/gui/CMakeLists.txt')
| -rw-r--r-- | src/gui/CMakeLists.txt | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 7c1d0bbe42..e0910091f1 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -698,28 +698,13 @@ qt_extend_target(Gui CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AN qt_extend_target(Gui CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite3 AND WIN32 SOURCES text/windows/qwindowsdirectwritefontdatabase.cpp text/windows/qwindowsdirectwritefontdatabase_p.h - DEFINES - QT_USE_DIRECTWRITE2 - QT_USE_DIRECTWRITE3 - LIBRARIES - dwrite_3 -) - -qt_extend_target(Gui CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite2 AND WIN32 AND NOT QT_FEATURE_directwrite3 - DEFINES - QT_USE_DIRECTWRITE2 LIBRARIES - dwrite_2 + dwrite # special case ) -qt_extend_target(Gui CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT QT_FEATURE_directwrite2 AND NOT QT_FEATURE_directwrite3 +qt_extend_target(Gui CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT QT_FEATURE_directwrite3 LIBRARIES - dwrite -) - -qt_extend_target(Gui CONDITION WIN32 AND (NOT QT_FEATURE_direct2d OR NOT QT_FEATURE_directwrite) - DEFINES - QT_NO_DIRECTWRITE + dwrite # special case ) qt_extend_target(Gui CONDITION MINGW AND WIN32 @@ -848,10 +833,10 @@ add_custom_command( # qvkgen_pimpl.input = "QMAKE_QVKGEN_INPUT" # qvkgen_pimpl.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.cpp" -#### Keys ignored in scope 103:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan: +#### Keys ignored in scope 100:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan: # qvkgen_h.variable_out = "HEADERS" -#### Keys ignored in scope 104:.:vulkan:vulkan/vulkan.pri:else: +#### Keys ignored in scope 101:.:vulkan:vulkan/vulkan.pri:else: # qvkgen_h.CONFIG = "target_predeps" "no_link" qt_extend_target(Gui CONDITION WASM |