summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2022-09-19 16:36:40 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-09-21 19:09:47 +0000
commit3d23b379a7c0a87922f9f5d9600fde8c4e58f1fd (patch)
treef72ab9aad698a5cd7ce7af835ed5a0d00bbcd8b0
parent34363b9c0528e4a6920581e10c68eec44bbd470a (diff)
Work-around GNOME bug misidentifying HTML contentv5.15.11-lts5.15.11
Correct application/x-extension-html to text/html Fixes: QTBUG-97392 Fixes: QTBUG-106688 Change-Id: I0d65c6950c5ba1504586cf564268463c5d4cd483 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> (cherry picked from commit 84ebd698597cf7a45b5e0967221547c21b1d67e8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/core/net/qrc_url_scheme_handler.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/net/qrc_url_scheme_handler.cpp b/src/core/net/qrc_url_scheme_handler.cpp
index 73bf24f1d..0a9943431 100644
--- a/src/core/net/qrc_url_scheme_handler.cpp
+++ b/src/core/net/qrc_url_scheme_handler.cpp
@@ -67,7 +67,10 @@ void QrcUrlSchemeHandler::requestStarted(QWebEngineUrlRequestJob *job)
QFileInfo fileInfo(*file);
QMimeDatabase mimeDatabase;
QMimeType mimeType = mimeDatabase.mimeTypeForFile(fileInfo);
- job->reply(mimeType.name().toUtf8(), file.take());
+ if (mimeType.name() == QStringLiteral("application/x-extension-html"))
+ job->reply("text/html", file.take());
+ else
+ job->reply(mimeType.name().toUtf8(), file.take());
}
} // namespace QtWebEngineCore