diff options
| author | Axel Spoerl <axel.spoerl@qt.io> | 2023-03-20 07:57:09 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-03-20 18:54:26 +0000 |
| commit | 550a899bac5120e9da1a169979ba61131de6a06f (patch) | |
| tree | 829f77db07452ed6af662fec4f2d237eb8c9f7df | |
| parent | 2ee8d8e47bc734151f46bb3dcdbab8c3c06b47b1 (diff) | |
| download | qtdoc-550a899bac5120e9da1a169979ba61131de6a06f.tar.gz | |
Documentviewer demo: Don't use QPdfPageSelector in Qt 6.5
The document viewer demo uses QPdfPageSelector, which is available in
Qt 6.6 but not in 6.5. This is why the demo fails to compile in 6.5.
This patch adds ifdef'ry in order to compile without QPdfPageSelector
in 6.5.
Fixes: QTBUG-111982
Change-Id: Iaad3e5705bba784b0ce69a7f6ddfabfbe4148e84
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
(cherry picked from commit d8e70effc964e12018d49f06ef9e9e8c511b9872)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | examples/demos/documentviewer/pdfviewer.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/examples/demos/documentviewer/pdfviewer.cpp b/examples/demos/documentviewer/pdfviewer.cpp index b6093c0b..669b9371 100644 --- a/examples/demos/documentviewer/pdfviewer.cpp +++ b/examples/demos/documentviewer/pdfviewer.cpp @@ -9,7 +9,9 @@ #include <QPdfBookmarkModel> #include <QPdfDocument> #include <QPdfPageNavigator> +#if QT_VERSION >= QT_VERSION_CHECK(6,6,0) #include <QPdfPageSelector> +#endif #include <QListView> #include <QPdfView> #include <QStandardPaths> @@ -48,12 +50,16 @@ void PdfViewer::initPdfViewer() { m_toolBar = addToolBar("PDF"); m_zoomSelector = new ZoomSelector(m_toolBar); - m_pageSelector = new QPdfPageSelector(m_toolBar); + auto *nav = m_pdfView->pageNavigator(); +#if QT_VERSION >= QT_VERSION_CHECK(6,6,0) + m_pageSelector = new QPdfPageSelector(m_toolBar); m_toolBar->insertWidget(m_uiAssets.forward, m_pageSelector); - connect(m_pageSelector, &QSpinBox::valueChanged, this, &PdfViewer::pageSelected); connect(m_pageSelector, &QSpinBox::valueChanged, this, &PdfViewer::pageSelected); + connect(nav, &QPdfPageNavigator::currentPageChanged, m_pageSelector, &QSpinBox::setValue); +#endif + connect(m_pdfView->pageNavigator(), &QPdfPageNavigator::backAvailableChanged, m_uiAssets.back, &QAction::setEnabled); m_actionBack = m_uiAssets.back; m_actionForward = m_uiAssets.forward; @@ -75,8 +81,6 @@ void PdfViewer::initPdfViewer() m_toolBar->addAction(actionZoomOut); connect(actionZoomOut, &QAction::triggered, this, &PdfViewer::onActionZoomOutTriggered); - auto *nav = m_pdfView->pageNavigator(); - connect(nav, &QPdfPageNavigator::currentPageChanged, m_pageSelector, &QSpinBox::setValue); connect(nav, &QPdfPageNavigator::backAvailableChanged, m_actionBack, &QAction::setEnabled); connect(nav, &QPdfPageNavigator::forwardAvailableChanged, m_actionForward, &QAction::setEnabled); @@ -135,7 +139,9 @@ void PdfViewer::openPdfFile() const auto documentTitle = m_document->metaData(QPdfDocument::MetaDataField::Title).toString(); statusMessage(!documentTitle.isEmpty() ? documentTitle : QStringLiteral("PDF Viewer")); pageSelected(0); +#if QT_VERSION >= QT_VERSION_CHECK(6,6,0) m_pageSelector->setMaximum(m_document->pageCount() - 1); +#endif statusMessage(tr("Opened PDF file %1").arg(m_file->fileName())); qCDebug(lcExample) << "Opened file" << m_file->fileName(); |