diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-04-13 17:25:16 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-04-13 17:25:16 +0200 |
| commit | 2dce0008ce53d27d281ad2dc00eb32d25ae5fc84 (patch) | |
| tree | 55d97b68f56b78f3388cdaaa4ae69648b7057f68 /src/pdf | |
| parent | 919dd97e835f469609a0710eb91f829a6d70e88c (diff) | |
| parent | 8fe660ecbbe1f126ce0da694adff956ad7159870 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ia01415e5a44b1df9ed8b3966ff3b39a414b1563c
Diffstat (limited to 'src/pdf')
| -rw-r--r-- | src/pdf/config/common.pri | 11 | ||||
| -rw-r--r-- | src/pdf/pdfcore.pro | 8 | ||||
| -rw-r--r-- | src/pdf/quick/qquickpdfsearchmodel.cpp | 4 |
3 files changed, 16 insertions, 7 deletions
diff --git a/src/pdf/config/common.pri b/src/pdf/config/common.pri index afd96c881..7e5459a2a 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) { diff --git a/src/pdf/pdfcore.pro b/src/pdf/pdfcore.pro index 998cddb7d..bb7146853 100644 --- a/src/pdf/pdfcore.pro +++ b/src/pdf/pdfcore.pro @@ -78,10 +78,10 @@ HEADERS += \ 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-freetype): QMAKE_USE += freetype +qtConfig(webengine-qt-png): QMAKE_USE += libpng +qtConfig(webengine-qt-harfbuzz): QMAKE_USE += harfbuzz +#qtConfig(webengine-qt-jpeg): QMAKE_USE += libjpeg qtConfig(webengine-qt-zlib){} #qtzlib is a part of QtCore load(qt_module) diff --git a/src/pdf/quick/qquickpdfsearchmodel.cpp b/src/pdf/quick/qquickpdfsearchmodel.cpp index a39178ba3..d91ca69f8 100644 --- a/src/pdf/quick/qquickpdfsearchmodel.cpp +++ b/src/pdf/quick/qquickpdfsearchmodel.cpp @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(qLcS, "qt.pdf.search") +Q_LOGGING_CATEGORY(qLcSearch, "qt.pdf.search") /*! \qmltype PdfSearchModel @@ -282,7 +282,7 @@ void QQuickPdfSearchModel::setCurrentResult(int currentResult) currentResult = 0; } } - qCDebug(qLcS) << "currentResult was" << m_currentResult + qCDebug(qLcSearch) << "currentResult was" << m_currentResult << "requested" << currentResultWas << "on page" << currentPageWas << "->" << currentResult << "on page" << m_currentPage; |