diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2021-03-03 09:26:10 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2021-04-06 12:27:55 +0100 |
| commit | 1f3412fa07b524fa7917250ed0cc2661abb9246a (patch) | |
| tree | f835458b9ce3889688a5916c9b028e835845d5fd | |
| parent | 063ce0d4e8fa33b4a03adc290a962b6cf6766717 (diff) | |
Fix qtpdf static builds on windows
Use correct qt zlib lib in case of windows.
Passing qtzlib is actually just done in shake of clarity
and proper dependency tracking since qtCore is most likely
always a dependency for any user app.
Fixes: QTBUG-91476
Change-Id: I20816ebf926472c642847e2611797a6decdeecee
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | src/pdf/config/common.pri | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/pdf/config/common.pri b/src/pdf/config/common.pri index 0602f0c36..f688caded 100644 --- a/src/pdf/config/common.pri +++ b/src/pdf/config/common.pri @@ -24,12 +24,21 @@ qtConfig(webengine-qt-freetype) { } qtConfig(webengine-qt-zlib) { + win32 { + CONFIG(debug, debug|release) { + qtzlib = Qt5Cored.lib + } else { + qtzlib = Qt5Core.lib + } + + } else { qtzlib = libQt5Core.a + } 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)\"" + gn_args += "qt_zlib=\"$$system_path($$[QT_INSTALL_LIBS]/$$qtzlib)\"" } qtConfig(pdf-v8) { |