diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-04-22 14:16:23 +0200 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2020-04-23 14:49:58 +0000 |
commit | 39c6581c8d9ee6a01a03f4f413e218c1d373da3c (patch) | |
tree | 8f9f646f234ad878f1d465c9e79903b4a753cf94 | |
parent | 580489ff37c338b01f43ce6999d749a94404c943 (diff) |
Fixup xkbcommon test
It needs to be includable without using special include path.
Task-number: QTBUG-83693
Change-Id: Ibdee6ff00fde66a9de970bbaba9282c42e420c6b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r-- | src/buildtools/configure.json | 12 |
1 files changed, 3 insertions, 9 deletions
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": { |