diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-02-11 16:41:48 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-02-17 17:40:41 +0100 |
| commit | 3ca825bbe6d334c08d2d55df792d6670036527e7 (patch) | |
| tree | e2cf9c5b8c1b13ad0d18c75957feef20918f628b | |
| parent | b30c29da75c48513c4b334d0f85dca5ef7a2919e (diff) | |
Remove QtPdf dependency on nss at build-time
Change-Id: I653dee03adcad422d1210fda48bdd5b701382b00
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/buildtools/config/support.pri | 1 | ||||
| -rw-r--r-- | src/buildtools/configure.json | 1 | ||||
| -rw-r--r-- | src/pdf/config/common.pri | 2 |
4 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty b/src/3rdparty -Subproject 391a8eef6c2cacbb0af330e6b1e8f3704536565 +Subproject 4cb5565114c77a22dee9c337a5be1f7d8f3e463 diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri index 54b5738cd..e7f869a15 100644 --- a/src/buildtools/config/support.pri +++ b/src/buildtools/config/support.pri @@ -55,7 +55,6 @@ 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 8b77d5c8c..812a91f9c 100644 --- a/src/buildtools/configure.json +++ b/src/buildtools/configure.json @@ -398,7 +398,6 @@ && (!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" ] }, diff --git a/src/pdf/config/common.pri b/src/pdf/config/common.pri index 2fc14de3b..0602f0c36 100644 --- a/src/pdf/config/common.pri +++ b/src/pdf/config/common.pri @@ -1,6 +1,8 @@ include($$QTWEBENGINE_OUT_ROOT/src/pdf/qtpdf-config.pri) QT_FOR_CONFIG += pdf-private +gn_args += use_nss_certs=false + qtConfig(webengine-qt-png) { gn_args += pdfium_use_qt_libpng=true gn_args += "pdfium_qt_libpng_includes=\"$$system_path($$QMAKE_INCDIR_LIBPNG)\"" |