From 39c6581c8d9ee6a01a03f4f413e218c1d373da3c Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 22 Apr 2020 14:16:23 +0200 Subject: Fixup xkbcommon test It needs to be includable without using special include path. Task-number: QTBUG-83693 Change-Id: Ibdee6ff00fde66a9de970bbaba9282c42e420c6b Reviewed-by: Thiago Macieira --- src/buildtools/configure.json | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json index 1298ab916..a80ef32eb 100644 --- a/src/buildtools/configure.json +++ b/src/buildtools/configure.json @@ -34,8 +34,9 @@ }, "webengine-xkbcommon": { "label": "xkbcommon", + "headers": "xkbcommon/xkbcommon.h", "sources": [ - { "type": "pkgConfig", "args": "xkbcommon" } + "-lxkbcommon" ] }, "webengine-xcomposite": { @@ -296,13 +297,6 @@ ] } }, - "webengine-xkbcommon": { - "label": "system xkbcommon", - "type": "compile", - "test": { - "include": "xkbcommon/xkbcommon.h" - } - }, "webengine-ninja": { "label": "system ninja", "type": "detectNinja" @@ -455,7 +449,7 @@ }, "webengine-system-xkbcommon": { "label": "xkbcommon", - "condition": "libs.webengine-xkbcommon && tests.webengine-xkbcommon", + "condition": "libs.webengine-xkbcommon", "output": [ "privateFeature" ] }, "webengine-system-xcomposite": { -- cgit v1.2.3