aboutsummaryrefslogtreecommitdiffstats
path: root/src/share
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2017-12-25 23:54:44 +0200
committerOrgad Shaneh <orgads@gmail.com>2018-02-12 07:14:57 +0000
commit8e43a51a33b80903f1bb8e1bbccf2d911924dae5 (patch)
tree68d5533f328f4fa7c9f69051629d2a77e721b129 /src/share
parentac1d3b6583a2e716b462840d230fdda43f5e9255 (diff)
GenericHighlighter: Update from KSyntaxHighlighting
ini.xml was also changed, but I disagree with this change (which removed ; and # as comments in ini files), so I left it untouched. Change-Id: I203b0d9382ed404623ea8ba6545970230f0e50ca Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/share')
-rw-r--r--src/share/3rdparty/generic-highlighter/json.xml2
-rw-r--r--src/share/3rdparty/generic-highlighter/xml.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/share/3rdparty/generic-highlighter/json.xml b/src/share/3rdparty/generic-highlighter/json.xml
index a187fe8f3f..28ad8e8a33 100644
--- a/src/share/3rdparty/generic-highlighter/json.xml
+++ b/src/share/3rdparty/generic-highlighter/json.xml
@@ -12,7 +12,7 @@
** http://tools.ietf.org/html/rfc4627
***************************************************************************
-->
-<language name="JSON" section="Markup" version="2" kateversion="2.4" extensions="*.json;.kateproject;.arcconfig" mimetype="application/json" author="Sebastian Pipping (sebastian@pipping.org)" license="GPL">
+<language name="JSON" section="Markup" version="3" kateversion="2.4" extensions="*.json;.kateproject;.arcconfig;*.gltf" mimetype="application/json" author="Sebastian Pipping (sebastian@pipping.org)" license="GPL">
<highlighting>
<list name="Constants">
<item>null</item>
diff --git a/src/share/3rdparty/generic-highlighter/xml.xml b/src/share/3rdparty/generic-highlighter/xml.xml
index 7cff05c06b..01658523a8 100644
--- a/src/share/3rdparty/generic-highlighter/xml.xml
+++ b/src/share/3rdparty/generic-highlighter/xml.xml
@@ -6,7 +6,7 @@
<!ENTITY name "(?![0-9])[\w_:][\w.:_-]*">
<!ENTITY entref "&amp;(#[0-9]+|#[xX][0-9A-Fa-f]+|&name;);">
]>
-<language name="XML" version="6" kateversion="3.4" section="Markup" extensions="*.docbook;*.xml;*.rc;*.daml;*.rdf;*.rss;*.xspf;*.xsd;*.svg;*.ui;*.kcfg;*.qrc;*.wsdl;*.scxml;*.xbel" mimetype="text/xml;text/book;text/daml;text/rdf;application/rss+xml;application/xspf+xml;image/svg+xml;application/x-designer;application/x-xbel;application/xml;application/scxml+xml" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
+<language name="XML" version="7" kateversion="3.4" section="Markup" extensions="*.docbook;*.xml;*.rc;*.daml;*.rdf;*.rss;*.xspf;*.xsd;*.svg;*.ui;*.kcfg;*.qrc;*.wsdl;*.scxml;*.xbel;*.dae" mimetype="text/xml;text/book;text/daml;text/rdf;application/rss+xml;application/xspf+xml;image/svg+xml;application/x-designer;application/x-xbel;application/xml;application/scxml+xml" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
<highlighting>
<contexts>