diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2020-09-25 10:19:35 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2020-12-08 08:48:04 +0100 |
| commit | e12b5932e64bad00162a1954a694d111e8a5ec35 (patch) | |
| tree | 0f5d7f3edccc3a09cab5edc24b0a0aecef0491d8 /src/pdf | |
| parent | b719da05c6429d72f4e0e0af44da0bf3f3e57984 (diff) | |
Add qt static deps when doing static build
Add qtfreetype, qthurfbuzz, qtlibpng, qtlibpng
static 3rdparty libs.
If qtbase has some 3rdaprty libs, which are also
present in chromium. This leads to duplicated symbols
and can lead to unexpected issues with application.
Currently we do only static builds for qtpdf, therefore
this changes only affects qtpdf builds.
If qtfreetype is used, hurfbuzz dependency is not used,
qtlibpng is only used when pdf compiled with xfa.
Task-number: QTBUG-87154
Change-Id: Ibba528268d9c989a2c63c1a7881ba0c95c325437
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/pdf')
| -rw-r--r-- | src/pdf/config/common.pri | 20 | ||||
| -rw-r--r-- | src/pdf/pdfcore.pro | 6 |
2 files changed, 26 insertions, 0 deletions
diff --git a/src/pdf/config/common.pri b/src/pdf/config/common.pri index dd5bfa293..66021c635 100644 --- a/src/pdf/config/common.pri +++ b/src/pdf/config/common.pri @@ -1,6 +1,26 @@ include($$QTWEBENGINE_OUT_ROOT/src/pdf/qtpdf-config.pri) QT_FOR_CONFIG += pdf-private +qtConfig(webengine-qt-png) { + gn_args += pdfium_use_qt_libpng=true + gn_args += "pdfium_qt_libpng_includes=\"$$system_path($$QMAKE_INCDIR_LIBPNG)\"" +} + +qtConfig(webengine-qt-jpeg) { + gn_args += use_qt_libjpeg=true + gn_args += "qt_libjpeg_includes=\"$$system_path($$QMAKE_INCDIR_LIBJPEG)\"" +} + +qtConfig(webengine-qt-harfbuzz) { + gn_args += use_qt_harfbuzz=true + gn_args += "qt_harfbuzz_includes=\"$$system_path($$QMAKE_INCDIR_HARFBUZZ)\"" +} + +qtConfig(webengine-qt-freetype) { + gn_args += use_qt_freetype=true + gn_args += "qt_freetype_includes=\"$$system_path($$QMAKE_INCDIR_FREETYPE)\"" +} + qtConfig(pdf-v8) { gn_args += pdf_enable_v8=true } else { diff --git a/src/pdf/pdfcore.pro b/src/pdf/pdfcore.pro index 2dfe39dc0..5ce7ed871 100644 --- a/src/pdf/pdfcore.pro +++ b/src/pdf/pdfcore.pro @@ -77,4 +77,10 @@ HEADERS += \ api/qpdfselection.h \ api/qpdfselection_p.h \ + +qtConfig(webengine-qt-freetype): QMAKE_USE_PRIVATE+= freetype +qtConfig(webengine-qt-png): QMAKE_USE_PRIVATE+= libpng +qtConfig(webengine-qt-harfbuzz): QMAKE_USE_PRIVATE+= harfbuzz +qtConfig(webengine-qt-jpeg): QMAKE_USE_PRIVATE+= libjpeg + load(qt_module) |