diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2019-08-23 16:46:09 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2019-09-19 04:11:51 +0000 |
| commit | a7f0c31e65034f997513625e3653c1164bfef5ce (patch) | |
| tree | c4bce05573d2996431b4f4bf91dc9d187424407f | |
| parent | 8852c18bbeef4d21683c77d745e9934aff5c5025 (diff) | |
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: Jörg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | src/buildtools/configure.json | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json index ef4965f34..3e7c2cd5d 100644 --- a/src/buildtools/configure.json +++ b/src/buildtools/configure.json @@ -372,6 +372,7 @@ && features.webengine-flex && tests.webengine-platform && tests.webengine-architecture + && (!config.linux || features.pkg-config) && (!features.xcb || features.webengine-ozone-x11) && (!config.win32 || features.webengine-winversion)", "output": [ "privateFeature" ] @@ -660,7 +661,15 @@ }, { "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." }, { @@ -696,8 +705,8 @@ }, "webengine-developer-build", { - "section": "Required system libraries", - "condition": "config.unix && !config.macos && features.build-qtwebengine-core", + "section": "QtWebEngine required system libraries", + "condition": "config.unix && !config.macos", "entries": [ "webengine-system-fontconfig", "webengine-system-dbus", @@ -707,8 +716,8 @@ ] }, { - "section": "Required system libraries for qpa-xcb", - "condition": "config.unix && !config.macos && features.build-qtwebengine-core", + "section": "QtWebEngine required system libraries for qpa-xcb", + "condition": "config.unix && !config.macos && features.xcb", "entries": [ "webengine-system-x11", "webengine-system-libdrm", |