summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2019-08-07 17:37:08 +0200
committerMichal Klocek <michal.klocek@qt.io>2019-08-15 07:57:57 +0200
commitb92aa117eb84a4023eca7f9e4def7a71f603b586 (patch)
tree1086d24a245bf25d3764e4dd226fb0f12f4409de /src
parent63b6f748f1073599845d57ee4f73aecad8182a33 (diff)
Move libvpx test to configure
Change-Id: I669b9d4cc28765b134386752d1fc14d14fa5b1dc Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/core/configure.json22
1 files changed, 16 insertions, 6 deletions
diff --git a/src/core/configure.json b/src/core/configure.json
index 0ee556cfb..3e7968d41 100644
--- a/src/core/configure.json
+++ b/src/core/configure.json
@@ -268,6 +268,21 @@
"sources": [
{ "type": "pkgConfig", "args": "x11" }
]
+ },
+ "webengine-libvpx": {
+ "label": "libvpx",
+ "test": {
+ "main": [
+ "vpx_codec_cx_pkt pkt;",
+ "pkt.data.frame.width[0] = 0u;",
+ "pkt.data.frame.height[0] = 0u;"
+ ]
+ },
+ "headers": "vpx/vpx_encoder.h",
+ "sources": [
+ { "type": "pkgConfig", "args": "vpx" },
+ "-lvpx"
+ ]
}
},
"tests" : {
@@ -282,11 +297,6 @@
"test": "khr",
"type": "compile"
},
- "webengine-libvpx": {
- "label": "libvpx",
- "test": "libvpx",
- "type": "compile"
- },
"webengine-winversion": {
"label": "winversion",
"test": "winversion",
@@ -513,7 +523,7 @@
},
"webengine-system-libvpx" : {
"label": "libvpx",
- "condition": "config.unix && tests.webengine-libvpx",
+ "condition": "config.unix && libs.webengine-libvpx",
"output": [ "privateFeature" ]
},
"webengine-system-snappy" : {