Commit a7f0c31e authored by Michal Klocek's avatar Michal Klocek
Browse files

Add pkg-config as a build requirement


In case pkg-config is not installed we got bogus warnings
about missing qpa-xcb packages.

Issue found on fresh ubuntu 19.04.

Change-Id: I983c6de88060ed3d8dee15bb80f39b173fc81f65
Reviewed-by: default avatarJörg Bornemann <joerg.bornemann@qt.io>
Showing with 14 additions and 5 deletions
...@@ -372,6 +372,7 @@ ...@@ -372,6 +372,7 @@
&& features.webengine-flex && features.webengine-flex
&& tests.webengine-platform && tests.webengine-platform
&& tests.webengine-architecture && tests.webengine-architecture
&& (!config.linux || features.pkg-config)
&& (!features.xcb || features.webengine-ozone-x11) && (!features.xcb || features.webengine-ozone-x11)
&& (!config.win32 || features.webengine-winversion)", && (!config.win32 || features.webengine-winversion)",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
...@@ -660,7 +661,15 @@ ...@@ -660,7 +661,15 @@
}, },
{ {
"type": "warning", "type": "warning",
"condition": "config.linux && !features.webengine-ozone-x11 && features.xcb", "condition": "config.linux && !features.pkg-config",
"message": "Could not find pkg-config."
},
{
"type": "warning",
"condition": "config.linux
&& features.pkg-config
&& features.xcb
&& !features.webengine-ozone-x11",
"message": "Could not find all necessary libraries for qpa-xcb support." "message": "Could not find all necessary libraries for qpa-xcb support."
}, },
{ {
...@@ -696,8 +705,8 @@ ...@@ -696,8 +705,8 @@
}, },
"webengine-developer-build", "webengine-developer-build",
{ {
"section": "Required system libraries", "section": "QtWebEngine required system libraries",
"condition": "config.unix && !config.macos && features.build-qtwebengine-core", "condition": "config.unix && !config.macos",
"entries": [ "entries": [
"webengine-system-fontconfig", "webengine-system-fontconfig",
"webengine-system-dbus", "webengine-system-dbus",
...@@ -707,8 +716,8 @@ ...@@ -707,8 +716,8 @@
] ]
}, },
{ {
"section": "Required system libraries for qpa-xcb", "section": "QtWebEngine required system libraries for qpa-xcb",
"condition": "config.unix && !config.macos && features.build-qtwebengine-core", "condition": "config.unix && !config.macos && features.xcb",
"entries": [ "entries": [
"webengine-system-x11", "webengine-system-x11",
"webengine-system-libdrm", "webengine-system-libdrm",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment