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/configure.json | |
| 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/configure.json')
| -rw-r--r-- | src/gui/configure.json | 39 |
1 files changed, 3 insertions, 36 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index af513346a2..2f113d56d9 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -96,27 +96,6 @@ { "type": "pkgConfig", "args": "directfb" } ] }, - "dwrite": { - "label": "DirectWrite", - "test": { - "main": [ - "IDWriteFactory *factory = 0;", - "DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, __uuidof(IDWriteFactory),", - " (IUnknown **)(&factory));" - ] - }, - "headers": "dwrite.h", - "sources": [ - "-ldwrite" - ] - }, - "dwrite_1": { - "label": "DirectWrite 1", - "headers": "dwrite_1.h", - "sources": [ - "-ldwrite" - ] - }, "dwrite_2": { "label": "DirectWrite 2", "test": { @@ -1046,25 +1025,13 @@ "directwrite": { "label": "DirectWrite", "emitIf": "config.win32", - "condition": "libs.dwrite", - "output": [ "privateFeature" ] - }, - "directwrite1": { - "label": "DirectWrite 1", - "emitIf": "config.win32", - "condition": "libs.dwrite_1", + "condition": "libs.dwrite_2", "output": [ "privateFeature" ] }, "directwrite3": { "label": "DirectWrite 3", "emitIf": "config.win32", - "condition": "features.directwrite1 && libs.dwrite_3", - "output": [ "privateFeature" ] - }, - "directwrite2": { - "label": "DirectWrite 2", - "emitIf": "config.win32", - "condition": "features.directwrite1 && libs.dwrite_2", + "condition": "features.directwrite && libs.dwrite_3", "output": [ "privateFeature" ] }, "direct2d": { @@ -1874,7 +1841,7 @@ "section": "Windows", "condition": "config.win32", "entries": [ - "direct2d", "directwrite", "directwrite2" + "direct2d", "directwrite", "directwrite3" ] } ] |