diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2020-10-05 10:31:40 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2020-12-08 08:48:15 +0100 |
| commit | 6401cc1f1fd50421ccb2ce90fdd84e3c519f3f72 (patch) | |
| tree | efe5b424fa25eae4064205fdb8e7ac503a83c2fc | |
| parent | ee86960b4d33150d456117b187422632aa65b4de (diff) | |
Add QtZlib as static dependency
QtZlib is a semi private module, headers are installed
as Qt5Zlib, however all object are in QtCore.
Add support to compile against Qt5Zlib when doing
static build.
Task-number: QTBUG-87154
Change-Id: I74d1b217725b37781808a54902f9acbee41c50c4
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | src/buildtools/configure.json | 8 | ||||
| -rw-r--r-- | src/pdf/config/common.pri | 9 | ||||
| -rw-r--r-- | src/pdf/pdfcore.pro | 1 |
3 files changed, 17 insertions, 1 deletions
diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json index e6de2c1f3..4948ca9a9 100644 --- a/src/buildtools/configure.json +++ b/src/buildtools/configure.json @@ -561,6 +561,11 @@ "condition": "config.unix && features.system-zlib && libs.webengine-zlib", "output": [ "privateFeature" ] }, + "webengine-qt-zlib" : { + "label": "QtZlib", + "condition": "config.static && !features.system-zlib", + "output": [ "privateFeature" ] + }, "webengine-system-libevent" : { "label": "libevent", "condition": "config.unix && libs.webengine-libevent", @@ -811,7 +816,8 @@ "webengine-qt-freetype", "webengine-qt-harfbuzz", "webengine-qt-png", - "webengine-qt-jpeg" + "webengine-qt-jpeg", + "webengine-qt-zlib" ] } ] diff --git a/src/pdf/config/common.pri b/src/pdf/config/common.pri index 66021c635..2fc14de3b 100644 --- a/src/pdf/config/common.pri +++ b/src/pdf/config/common.pri @@ -21,6 +21,15 @@ qtConfig(webengine-qt-freetype) { 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/pdfcore.pro b/src/pdf/pdfcore.pro index 5ce7ed871..573640030 100644 --- a/src/pdf/pdfcore.pro +++ b/src/pdf/pdfcore.pro @@ -82,5 +82,6 @@ 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) |