diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-12-11 10:55:18 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-12-11 15:52:24 +0100 |
| commit | 91696b2cb090e5b6147a30465f74d8d37db48615 (patch) | |
| tree | e73d4adee4f9f2040e8986b8388737d3bf866a5d /src/pdf | |
| parent | 1b79f9ccffe468107be5f6c5d3ad42cdcfdef585 (diff) | |
| parent | dad48eb41d1b4b4b32c73884a1c29dd6d9408c33 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Id1a1f4ca84697ba18e2604090e3154295fe1858b
Diffstat (limited to 'src/pdf')
| -rw-r--r-- | src/pdf/config/common.pri | 29 | ||||
| -rw-r--r-- | src/pdf/config/ios.pri | 1 | ||||
| -rw-r--r-- | src/pdf/configure.json | 2 | ||||
| -rw-r--r-- | src/pdf/pdfcore.pro | 7 |
4 files changed, 38 insertions, 1 deletions
diff --git a/src/pdf/config/common.pri b/src/pdf/config/common.pri index dd5bfa293..303c4a91c 100644 --- a/src/pdf/config/common.pri +++ b/src/pdf/config/common.pri @@ -1,6 +1,35 @@ 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(webengine-qt-zlib) { + gn_args += use_qt_zlib = true + gn_args += "qt_zlib_includes=\["\ + "\"$$system_path($$[QT_INSTALL_HEADERS])\"," \ + "\"$$system_path($$[QT_INSTALL_HEADERS]/QtCore)\"," \ + "\"$$system_path($$[QT_INSTALL_HEADERS]/QtZlib)\"\]" + gn_args += "qt_zlib=\"$$system_path($$[QT_INSTALL_LIBS]/libQt5Core.a)\"" +} + qtConfig(pdf-v8) { gn_args += pdf_enable_v8=true } else { diff --git a/src/pdf/config/ios.pri b/src/pdf/config/ios.pri index 1dcbeffde..cd7597d85 100644 --- a/src/pdf/config/ios.pri +++ b/src/pdf/config/ios.pri @@ -37,6 +37,7 @@ clang_base_path=\"$${clang_dir}\" \ ios_enable_code_signing=false \ target_os=\"ios\" \ ios_deployment_target=\"$${QMAKE_IOS_DEPLOYMENT_TARGET}\" \ +mac_sdk_min=\"$${QMAKE_MAC_SDK_VERSION_MAJOR_MINOR}\" \ enable_ios_bitcode=true \ use_jumbo_build=false diff --git a/src/pdf/configure.json b/src/pdf/configure.json index ddc0e99dc..069893660 100644 --- a/src/pdf/configure.json +++ b/src/pdf/configure.json @@ -2,7 +2,7 @@ "module": "pdf", "depends" : [ "buildtools-private" ], "testDir": "../../config.tests", - "condition": "features.build-qtpdf && features.webengine-qtpdf-support", + "condition": "module.gui && features.webengine-qtpdf-support && features.build-qtpdf", "libraries": { }, "tests": { diff --git a/src/pdf/pdfcore.pro b/src/pdf/pdfcore.pro index 2dfe39dc0..998cddb7d 100644 --- a/src/pdf/pdfcore.pro +++ b/src/pdf/pdfcore.pro @@ -77,4 +77,11 @@ 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 +qtConfig(webengine-qt-zlib){} #qtzlib is a part of QtCore + load(qt_module) |