diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2023-02-28 13:39:25 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-02-28 14:51:52 +0000 |
| commit | acffe300283966baa96c6e74b536b619d958f26f (patch) | |
| tree | 463ebfb7d8549110ad20482054edaeac1d93f4ac | |
| parent | 2c26f5cca11c382dbdc427fac7949706620a194f (diff) | |
| download | qttools-acffe300283966baa96c6e74b536b619d958f26f.tar.gz | |
Report QLiteHtmlWidget in Assistant's About dialog if used
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ö <topi.reinio@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
(cherry picked from commit a205c69ae2a69ffc1209e37ea05e2b9699241a44)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/assistant/assistant/mainwindow.cpp | 6 |
1 files 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("<center>" "<h3>%1</h3>" "<p>Version %2</p>" |