diff options
Diffstat (limited to 'src/gui/configure.json')
| -rw-r--r-- | src/gui/configure.json | 35 |
1 files changed, 25 insertions, 10 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index d5cbe6f78a..8bc3e8dc0c 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -189,6 +189,20 @@ "-ldwrite" ] }, + "dwrite_3": { + "label": "DirectWrite 3", + "test": { + "main": [ + "IUnknown *factory = 0;", + "DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, __uuidof(IDWriteFactory3),", + " &factory);" + ] + }, + "headers": "dwrite_3.h", + "sources": [ + "-ldwrite" + ] + }, "drm": { "label": "KMS", "test": { @@ -373,6 +387,7 @@ }, "headers": "jpeglib.h", "sources": [ + { "type": "pkgConfig", "args": "libjpeg" }, { "libs": "-llibjpeg", "condition": "config.msvc" }, "-ljpeg" ] @@ -1144,6 +1159,12 @@ "condition": "libs.dwrite_1", "output": [ "privateFeature" ] }, + "directwrite3": { + "label": "DirectWrite 3", + "emitIf": "config.win32", + "condition": "features.directwrite1 && libs.dwrite_3", + "output": [ "privateFeature" ] + }, "directwrite2": { "label": "DirectWrite 2", "emitIf": "config.win32", @@ -1315,7 +1336,7 @@ }, "opengles3": { "label": "OpenGL ES 3.0", - "condition": "features.opengles2 && !features.angle && tests.opengles3 && !config.wasm", + "condition": "features.opengles2 && !features.angle && tests.opengles3", "output": [ "publicFeature", { "type": "define", "name": "QT_OPENGL_ES_3" } @@ -1375,7 +1396,7 @@ }, "egl": { "label": "EGL", - "condition": "(features.opengl || features.openvg) && (features.angle || libs.egl) && (features.dlopen || !config.unix)", + "condition": "(features.opengl || features.openvg) && (features.angle || libs.egl) && (features.dlopen || !config.unix || config.integrity)", "output": [ "privateFeature", "feature" ] }, "egl_x11": { @@ -1636,15 +1657,9 @@ "condition": "features.imageformat_xpm", "output": [ "publicFeature", "feature" ] }, - "shortcut": { - "label": "QShortcut", - "purpose": "Provides keyboard accelerators and shortcuts.", - "section": "Kernel", - "output": [ "publicFeature", "feature" ] - }, "action": { - "label": "QAction", - "purpose": "Provides widget actions.", + "label": "Q(Gui)Action(Group)", + "purpose": "Provides abstract user interface actions.", "section": "Kernel", "output": [ "publicFeature", "feature" ] }, |