aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Stenger <christian.stenger@qt.io>2019-07-11 07:53:36 +0200
committerChristian Stenger <christian.stenger@qt.io>2019-07-11 13:54:57 +0000
commit3ea670d207a22b43e05fd5c520e7574d1888c26a (patch)
tree26813ea9948fbcffd9b21b4b84d1d8c496c16f28
parent526163cc16084045647e1a06a90507bd5afb5e06 (diff)
QmlJSEditor: Remove registration of json files
Do not open json files with the QmlJSEditor as this produces strange warnings and Json is not JavaScript at all. Rely on the correct syntax highlighting by the generic highlighter and KSyntaxHighlighting respectively. Beside this it helps also when using a json language server. Task-number: QTCREATORBUG-22697 Change-Id: Iebd0009c550d9ea701d504797d528226dc32b0ec Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
-rw-r--r--src/plugins/qmljseditor/qmljseditor.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp
index 61576372ea1..068d12f3204 100644
--- a/src/plugins/qmljseditor/qmljseditor.cpp
+++ b/src/plugins/qmljseditor/qmljseditor.cpp
@@ -1036,7 +1036,6 @@ QmlJSEditorFactory::QmlJSEditorFactory()
addMimeType(QmlJSTools::Constants::QBS_MIMETYPE);
addMimeType(QmlJSTools::Constants::QMLTYPES_MIMETYPE);
addMimeType(QmlJSTools::Constants::JS_MIMETYPE);
- addMimeType(QmlJSTools::Constants::JSON_MIMETYPE);
setDocumentCreator([]() { return new QmlJSEditorDocument; });
setEditorWidgetCreator([]() { return new QmlJSEditorWidget; });