diff options
| author | Axel Spoerl <axel.spoerl@qt.io> | 2024-05-06 17:12:36 +0200 |
|---|---|---|
| committer | Axel Spoerl <axel.spoerl@qt.io> | 2024-05-08 09:45:55 +0200 |
| commit | 59c784dff204491b719a868a541eb7c41877ed87 (patch) | |
| tree | d8418214e94e2cb3704a3b6c8ff237b20b2184f9 | |
| parent | 45b2e7d1f814aaed0f5f47bad09085a035924078 (diff) | |
Documentviewer demo: Reset AbstractView::m_printingEnabled in cleanup
m_printingEnabled wasn't reset in AbstractViewer::cleanup().
That prevented the printingEnabledChanged() signal from being fired,
when a viewer displayed a printable document from the 2nd time onward.
Always disable printing in the cleanup() method.
Fixes: QTBUG-125057
Pick-to: 6.7
Change-Id: I7d237a27a3547103ef0ce099a0735b2444bc0248
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| -rw-r--r-- | examples/demos/documentviewer/app/abstractviewer.cpp | 1 | ||||
| -rw-r--r-- | examples/demos/documentviewer/app/mainwindow.cpp | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/examples/demos/documentviewer/app/abstractviewer.cpp b/examples/demos/documentviewer/app/abstractviewer.cpp index 693d4e3ea..9b4daef09 100644 --- a/examples/demos/documentviewer/app/abstractviewer.cpp +++ b/examples/demos/documentviewer/app/abstractviewer.cpp @@ -176,6 +176,7 @@ void AbstractViewer::cleanup() QObject::disconnect(connection); m_connections.clear(); + maybeSetPrintingEnabled(false); } QMenu *AbstractViewer::fileMenu() diff --git a/examples/demos/documentviewer/app/mainwindow.cpp b/examples/demos/documentviewer/app/mainwindow.cpp index f40dee886..5e3c3657e 100644 --- a/examples/demos/documentviewer/app/mainwindow.cpp +++ b/examples/demos/documentviewer/app/mainwindow.cpp @@ -83,7 +83,6 @@ bool MainWindow::openFile(const QString &fileName) return false; } - ui->actionPrint->setEnabled(m_viewer->hasContent()); for (const QMetaObject::Connection &connection : m_viewerConnections) disconnect(connection); |