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 21:38:44 +0000
commit903365f84f40ecd0b06acfe57a9a38be090e0020 (patch)
tree342c4ad11f38084662870282a2039885a13530e1
parent938850b95627e4feab0b5fcb9b1a33759daa41cf (diff)
Work-around GNOME bug misidentifying HTML content
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 416fb82ff..ab66acac0 100644
--- a/src/core/net/qrc_url_scheme_handler.cpp
+++ b/src/core/net/qrc_url_scheme_handler.cpp
@@ -31,7 +31,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