summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2020-11-12 09:52:53 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-11-12 12:19:37 +0000
commit02eed75d1661371fb76b496dfd08cbd198737b35 (patch)
tree3139efee53b8a36e6ee963684b47091c3e3f9ed3
parent6dc0f1f51ab4fbc907650713d8310126ffb0af3a (diff)
downloadqttools-02eed75d1661371fb76b496dfd08cbd198737b35.tar.gz
qdoc: Handle JSON as plain text
The JavaScript code marker failed to handle JSON snippets; drop the advertised support for it, parsing JSON as plain text. This is OK as there's typically no types to link to or highlighting needed for JSON data. Fixes: QTBUG-81596 Change-Id: I004fcbe97a66ff5a33c4c443a24d16107aacb4c8 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit d54cfd5ade5c18ed66a1defa337ca3f6aea2ab1a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/qdoc/jscodemarker.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qdoc/jscodemarker.cpp b/src/qdoc/jscodemarker.cpp
index b3c675d5b..0e1eb2267 100644
--- a/src/qdoc/jscodemarker.cpp
+++ b/src/qdoc/jscodemarker.cpp
@@ -78,16 +78,16 @@ bool JsCodeMarker::recognizeCode(const QString &code)
*/
bool JsCodeMarker::recognizeExtension(const QString &ext)
{
- return ext == "js" || ext == "json";
+ return ext == "js";
}
/*!
- Returns \c true if the \a language is recognized. We recognize JavaScript,
- ECMAScript and JSON.
+ Returns \c true if the \a language is recognized. We recognize JavaScript and
+ ECMAScript.
*/
bool JsCodeMarker::recognizeLanguage(const QString &language)
{
- return language == "JavaScript" || language == "ECMAScript" || language == "JSON";
+ return language == "JavaScript" || language == "ECMAScript";
}
/*!