From acffe300283966baa96c6e74b536b619d958f26f Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Tue, 28 Feb 2023 13:39:25 +0100 Subject: Report QLiteHtmlWidget in Assistant's About dialog if used MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It has been confusing for several releases that the About dialog kept saying it's using QTextBrowser. I can't find any evidence that there's even any code to instantiate a HelpViewerImpl right now. Amends 6e7ef34e6c8a2bd130fd5305e4b41fc8b11100a3 which removed the call "new HelpViewerImpl" in the HelpViewer ctor. Task-number: QTBUG-92267 Change-Id: Ieed2cf3237a07772152f179b9a82a2e35bfed0ee Reviewed-by: Topi Reiniƶ Reviewed-by: Jarek Kobus (cherry picked from commit a205c69ae2a69ffc1209e37ea05e2b9699241a44) Reviewed-by: Qt Cherry-pick Bot --- src/assistant/assistant/mainwindow.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/assistant/assistant/mainwindow.cpp b/src/assistant/assistant/mainwindow.cpp index a6fbe8136..76b457736 100644 --- a/src/assistant/assistant/mainwindow.cpp +++ b/src/assistant/assistant/mainwindow.cpp @@ -844,10 +844,12 @@ void MainWindow::showAboutDialog() } else { QByteArray resources; #if defined(BROWSER_QTWEBKIT) - const QString browser = QStringLiteral("Qt WebKit"); + QString browser = QStringLiteral("Qt WebKit"); #else - const QString browser = QStringLiteral("QTextBrowser"); + QString browser = QStringLiteral("QTextBrowser"); #endif + if (m_centralWidget->currentHelpViewer()) + browser = QStringLiteral("QLiteHtmlWidget"); aboutDia.setText(tr("
" "

%1

" "

Version %2

" -- cgit v1.2.1