diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2020-11-12 09:52:53 +0100 |
|---|---|---|
| committer | Topi Reinio <topi.reinio@qt.io> | 2020-11-12 13:00:06 +0100 |
| commit | d54cfd5ade5c18ed66a1defa337ca3f6aea2ab1a (patch) | |
| tree | cf4e7bec85d3beb8f8f197304d621a8ea7f43047 | |
| parent | e3bd2ad4a9744e094b64b4ebf39c4ef14e759338 (diff) | |
| download | qttools-d54cfd5ade5c18ed66a1defa337ca3f6aea2ab1a.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.
Pick-to: 5.15
Fixes: QTBUG-81596
Change-Id: I004fcbe97a66ff5a33c4c443a24d16107aacb4c8
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| -rw-r--r-- | src/qdoc/jscodemarker.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qdoc/jscodemarker.cpp b/src/qdoc/jscodemarker.cpp index 50c9592ba..ee773f789 100644 --- a/src/qdoc/jscodemarker.cpp +++ b/src/qdoc/jscodemarker.cpp @@ -77,16 +77,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"; } /*! |