From 8e43a51a33b80903f1bb8e1bbccf2d911924dae5 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Mon, 25 Dec 2017 23:54:44 +0200
Subject: 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>
---
 src/share/3rdparty/generic-highlighter/json.xml | 2 +-
 src/share/3rdparty/generic-highlighter/xml.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/share')

diff --git a/src/share/3rdparty/generic-highlighter/json.xml b/src/share/3rdparty/generic-highlighter/json.xml
index a187fe8f3f5..28ad8e8a33d 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 7cff05c06b9..01658523a8a 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>
-- 
cgit v1.2.3