diff options
| author | Paul Wicking <paul.wicking@qt.io> | 2019-02-01 13:33:25 +0100 |
|---|---|---|
| committer | Paul Wicking <paul.wicking@qt.io> | 2019-02-01 13:33:26 +0100 |
| commit | 2bc362c9fa37455afbeb56e5f1852188ede3eab4 (patch) | |
| tree | b89e3c2c082a0285e8cd91733ddbc772fe4362a5 /src/gui/configure.json | |
| parent | 5de981d3bc3df874f9df35a6899345f4f61fa951 (diff) | |
| parent | 481db443d502c8ebc169b7256cb696428cf02199 (diff) | |
Merge dev into 5.13
Change-Id: I8113c6d8735a151bd152e6096f8c8b8e63a05474
Diffstat (limited to 'src/gui/configure.json')
| -rw-r--r-- | src/gui/configure.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index 39c0232c0b..70d0817791 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -239,7 +239,8 @@ "sources": [ { "type": "pkgConfig", "args": "freetype2" }, { "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" }, - { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" } + { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" }, + { "libs": "-lfreetype" } ], "use": [ { "lib": "zlib", "condition": "features.system-zlib" } @@ -1436,7 +1437,7 @@ }, "eglfs_x11": { "label": "EGLFS X11", - "condition": "features.eglfs && features.xcb && features.xcb-xlib && features.egl_x11", + "condition": "features.eglfs && features.xcb-xlib && features.egl_x11", "output": [ "privateFeature" ] }, "gif": { @@ -1569,7 +1570,6 @@ }, "xcb-xlib": { "label": "XCB Xlib", - "emitIf": "features.xcb", "condition": "features.xlib && libs.xcb_xlib", "output": [ "privateFeature" ] }, |