From b89d8c406b5809f868f1a06d9ab05096ecb226f3 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 29 May 2020 11:03:49 +0200 Subject: 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 --- src/plugins/platforms/platforms.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins/platforms/platforms.pro') diff --git a/src/plugins/platforms/platforms.pro b/src/plugins/platforms/platforms.pro index ab7ee395d7..2ce9790d91 100644 --- a/src/plugins/platforms/platforms.pro +++ b/src/plugins/platforms/platforms.pro @@ -16,7 +16,7 @@ osx: SUBDIRS += cocoa win32: SUBDIRS += windows -qtConfig(direct2d1_1):qtConfig(directwrite1) { +qtConfig(direct2d1_1):qtConfig(directwrite) { SUBDIRS += direct2d } -- cgit v1.2.3