diff options
Diffstat (limited to 'src/gui/configure.json')
| -rw-r--r-- | src/gui/configure.json | 44 |
1 files changed, 37 insertions, 7 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index 1c4a499298..48579b309a 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -7,6 +7,7 @@ "commandline": { "options": { + "accessibility": "boolean", "angle": "boolean", "direct2d": "boolean", "directfb": "boolean", @@ -32,6 +33,7 @@ "opengl": { "type": "optionalString", "values": [ "no", "yes", "desktop", "es2", "dynamic" ] }, "opengl-es-2": { "type": "void", "name": "opengl", "value": "es2" }, "opengles3": "boolean", + "openvg": "boolean", "qpa": { "type": "string", "name": "qpa_default_platform" }, "qpa-platform-guard": "boolean", "sm": { "type": "boolean", "name": "sessionmanager" }, @@ -169,7 +171,7 @@ "label": "Mir client libraries", "test": "qpa/mirclient", "sources": [ - { "type": "pkgConfig", "args": "egl mirclient ubuntu-platform-api" } + { "type": "pkgConfig", "args": "egl mirclient ubuntu-platform-api libcontent-hub >= 0.2.0" } ] }, "mtdev": { @@ -195,6 +197,14 @@ { "type": "makeSpec", "spec": "OPENGL_ES2" } ] }, + "openvg": { + "label": "OpenVG", + "test": "unix/openvg", + "sources": [ + { "type": "pkgConfig", "args": "vg" }, + { "type": "makeSpec", "spec": "OPENVG" } + ] + }, "tslib": { "label": "tslib", "test": "unix/tslib", @@ -497,7 +507,7 @@ "kms": { "label": "KMS", "condition": "libs.drm", - "output": [ "publicQtConfig" ] + "output": [ "publicQtConfig", "privateFeature" ] }, "libinput": { "label": "libinput", @@ -518,12 +528,19 @@ "linuxfb": { "label": "LinuxFB", "section": "Platform plugins", - "condition": "tests.linuxfb", + "condition": "tests.linuxfb && features.regularexpression", + "output": [ "privateFeature" ] + }, + "vnc": { + "label": "VNC", + "section": "Platform plugins", + "condition": "config.unix && !config.android && !config.darwin && features.regularexpression", "output": [ "privateFeature" ] }, "mirclient": { "label": "Mir client", "section": "Platform plugins", + "autoDetect": false, "condition": "libs.mirclient", "output": [ "privateFeature" ] }, @@ -582,9 +599,14 @@ "condition": "features.opengl-desktop || features.opengl-dynamic || features.opengles2", "output": [ "publicFeature", "feature" ] }, + "openvg": { + "label": "OpenVG", + "condition": "libs.openvg", + "output": [ "publicFeature" ] + }, "egl": { "label": "EGL", - "condition": "features.opengl && (features.angle || libs.egl)", + "condition": "(features.opengl || features.openvg) && (features.angle || libs.egl)", "output": [ "privateFeature", "feature" ] }, "egl_x11": { @@ -866,7 +888,6 @@ "label": "QImageIOPlugin", "purpose": "Provides a base for writing a image format plugins.", "section": "Images", - "condition": "features.library", "output": [ "publicFeature", "feature" ] }, "movie": { @@ -952,6 +973,7 @@ "label": "QSystemTrayIcon", "purpose": "Provides an icon for an application in the system tray.", "section": "Utilities", + "condition": "features.temporaryfile", "output": [ "publicFeature", "feature" ] }, "accessibility": { @@ -1021,6 +1043,11 @@ Specify -opengl desktop to use regular OpenGL." "message": "The OpenGL functionality tests failed! You might need to modify the include and library search paths by editing QMAKE_INCDIR_OPENGL[_ES2], QMAKE_LIBDIR_OPENGL[_ES2] and QMAKE_LIBS_OPENGL[_ES2] in the mkspec for your platform." + }, + { + "type": "warning", + "condition": "!features.accessibility", + "message": "Accessibility disabled. This configuration of Qt is unsupported." } ], @@ -1028,6 +1055,7 @@ QMAKE_LIBDIR_OPENGL[_ES2] and QMAKE_LIBS_OPENGL[_ES2] in the mkspec for your pla { "section": "Qt Gui", "entries": [ + "accessibility", "freetype", "system-freetype", "harfbuzz", @@ -1039,6 +1067,8 @@ QMAKE_LIBDIR_OPENGL[_ES2] and QMAKE_LIBS_OPENGL[_ES2] in the mkspec for your pla "gif", "ico", "jpeg", "system-jpeg", "png", "system-png" ] }, + "egl", + "openvg", { "section": "OpenGL", "entries": [ @@ -1047,7 +1077,6 @@ QMAKE_LIBDIR_OPENGL[_ES2] and QMAKE_LIBS_OPENGL[_ES2] in the mkspec for your pla "args": "angle", "condition": "config.win32" }, - "egl", "opengl-desktop", { "type": "feature", @@ -1083,8 +1112,9 @@ QMAKE_LIBDIR_OPENGL[_ES2] and QMAKE_LIBS_OPENGL[_ES2] in the mkspec for your pla "eglfs_viv", "eglfs_viv_wl", "eglfs_egldevice", "eglfs_gbm", "eglfs_mali", "eglfs_brcm", "egl_x11" ] }, - "linuxfb", "mirclient", + "linuxfb", "vnc", "mirclient", { + "type": "feature", "message": "INTEGRITY framebuffer", "condition": "config.integrity", "args": "integrityfb" |