From 95e93830e45f5f10397248a794672ff6a681c8b8 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 8 Feb 2021 13:34:19 +0100 Subject: QtPdf apparently depends on libnss on linux At least that pkg-config can resolve it. Change-Id: Id0e0a37ad4aa85f11dfdd74bc174d17d36ed4ce2 Reviewed-by: Michal Klocek --- src/buildtools/config/support.pri | 1 + src/buildtools/configure.json | 1 + 2 files changed, 2 insertions(+) diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri index e7f869a15..54b5738cd 100644 --- a/src/buildtools/config/support.pri +++ b/src/buildtools/config/support.pri @@ -55,6 +55,7 @@ defineReplace(qtwebengine_checkPdfError) { !qtwebengine_checkForSanitizer(QtPdf):return(false) linux:!qtwebengine_checkForPkgCfg(QtPdf):return(false) linux:!qtwebengine_checkForHostPkgCfg(QtPdf):return(false) + linux:!qtwebengine_checkForPackage(QtPdf,nss):return(false) win32:!qtwebengine_checkForWinVersion(QtPdf):return(false) return(true) } diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json index 812a91f9c..8b77d5c8c 100644 --- a/src/buildtools/configure.json +++ b/src/buildtools/configure.json @@ -398,6 +398,7 @@ && (!config.sanitizer || features.webengine-sanitizer) && (!config.linux || features.pkg-config) && (!config.linux || features.webengine-host-pkg-config) + && (!config.linux || features.webengine-system-nss) && (!config.win32 || features.webengine-winversion)", "output": [ "privateFeature" ] }, -- cgit v1.2.3