diff options
Diffstat (limited to 'src/gui/configure.json')
| -rw-r--r-- | src/gui/configure.json | 41 |
1 files changed, 25 insertions, 16 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index 376359ba37..318efe5401 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -54,6 +54,14 @@ "-lbcm_host" ] }, + "direct2d": { + "label": "Direct 2D", + "export": "", + "test": "qpa/direct2d", + "sources": [ + "-ld2d1 -ldwrite -ld3d11" + ] + }, "directfb": { "label": "DirectFB", "test": "qpa/directfb", @@ -87,10 +95,10 @@ }, "freetype": { "label": "FreeType", - "export": "", "test": "unix/freetype", "sources": [ - "-lfreetype" + { "type": "pkgConfig", "args": "freetype2" }, + { "type": "freetype", "libs": "-lfreetype" } ] }, "fontconfig": { @@ -98,7 +106,7 @@ "test": "unix/fontconfig", "sources": [ { "type": "pkgConfig", "args": "fontconfig freetype2" }, - "-lfontconfig -lfreetype" + { "type": "freetype", "libs": "-lfontconfig -lfreetype" } ] }, "gbm": { @@ -294,12 +302,6 @@ }, "tests": { - "direct2d": { - "label": "Direct 2D", - "type": "compile", - "test": "qpa/direct2d", - "use": "direct2d" - }, "directwrite2": { "label": "DirectWrite 2", "type": "compile", @@ -356,6 +358,12 @@ "type": "compile", "test": "unix/evdev" }, + "libinput_axis_api": { + "label": "axis API in libinput", + "type": "compile", + "test": "unix/libinput_axis_api", + "use": "libinput" + }, "linuxfb": { "label": "LinuxFB", "type": "compile", @@ -436,7 +444,7 @@ "direct2d": { "label": "Direct 2D", "autoDetect": false, - "condition": "tests.direct2d", + "condition": "config.win32 && libs.direct2d", "output": [ "privateFeature" ] }, "evdev": { @@ -446,6 +454,8 @@ }, "freetype": { "label": "FreeType", + "purpose": "Supports the FreeType 2 font engine (and its supported font formats).", + "section": "Fonts", "output": [ "privateFeature", "feature" ] }, "system-freetype": { @@ -499,6 +509,11 @@ "condition": "features.libudev && libs.libinput", "output": [ "privateFeature" ] }, + "libinput-axis-api": { + "label": "axis API in libinput", + "condition": "tests.libinput_axis_api", + "output": [ "privateFeature" ] + }, "lgmon": { "label": "lgmon", "emitIf": "config.qnx", @@ -922,12 +937,6 @@ "condition": "features.temporaryfile", "output": [ "publicFeature", "feature" ] }, - "freetype": { - "label": "Freetype Font Engine", - "purpose": "Supports the FreeType 2 font engine (and its supported font formats).", - "section": "Fonts", - "output": [ "publicFeature", "feature" ] - }, "desktopservices": { "label": "QDesktopServices", "purpose": "Provides methods for accessing common desktop services.", |