diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-10-10 18:51:33 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-10-11 06:09:44 +0000 |
| commit | 5c652cb6aa11d508236f80cfdb0ac7cf25fcda70 (patch) | |
| tree | 9cdeefc9ad98e3efc79360b02c9582c9e50dc5d2 /src/gui | |
| parent | dee8b4d6b1d08e8ede98f38e7c972a7d1099d6c1 (diff) | |
unbreak direct2d test
amends c0cc5052.
Change-Id: Icdf157d0711d9de85b108ab2ff1da0e1fc2e4a9d
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/configure.json | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index d8969a1e4e..8df63c8ee0 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", @@ -294,12 +302,6 @@ }, "tests": { - "direct2d": { - "label": "Direct 2D", - "type": "compile", - "test": "qpa/direct2d", - "use": "direct2d" - }, "directwrite2": { "label": "DirectWrite 2", "type": "compile", @@ -442,7 +444,7 @@ "direct2d": { "label": "Direct 2D", "autoDetect": false, - "condition": "tests.direct2d", + "condition": "config.win32 && libs.direct2d", "output": [ "privateFeature" ] }, "evdev": { |