From a7f0c31e65034f997513625e3653c1164bfef5ce Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Fri, 23 Aug 2019 16:46:09 +0200
Subject: [PATCH] Add pkg-config as a build requirement
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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>
---
src/buildtools/configure.json | 19 ++++++++++++++-----
1 file 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",
--
GitLab