diff options
| author | Darrell Anderson <[email protected]> | 2014-03-03 23:13:48 -0600 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2014-03-03 23:13:48 -0600 |
| commit | a878d3ef3f87b6d971190423b7c70b1919c97a67 (patch) | |
| tree | 2d0faac89759ef40a3eab0142cc761ef3341a0b9 /kate/data/qt4.xml | |
| parent | 333a2116d63ab837db093dbb141bf7cb987686a1 (diff) | |
| parent | 316893d4498bedc490a8e21a54a73d9f5ca58424 (diff) | |
| download | tdelibs-a878d3ef3f87b6d971190423b7c70b1919c97a67.tar.gz tdelibs-a878d3ef3f87b6d971190423b7c70b1919c97a67.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'kate/data/qt4.xml')
| -rw-r--r-- | kate/data/qt4.xml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kate/data/qt4.xml b/kate/data/qt4.xml index 02b6ba47f..2c1d1e099 100644 --- a/kate/data/qt4.xml +++ b/kate/data/qt4.xml @@ -9,10 +9,10 @@ Copyright (c) 2012 by Alex Turbov ([email protected]) --> <language - name="C++11/Qt4" + name="C++/Qt4" section="Sources" - version="1.01" - kateversion="2.5" + version="1.2" + kateversion="2.4" indenter="cstyle" extensions="*.moc" mimetype="text/x-c++src;text/x-c++hdr;text/x-chdr" @@ -1551,10 +1551,10 @@ </list> <contexts> - <!-- Base context for C++11 and Qt highlighting to be used as standalone syntax --> + <!-- Base context for C++ and Qt highlighting to be used as standalone syntax --> <context attribute="Normal Text" lineEndContext="#stay" name="Normal"> <IncludeRules context="DetectQt4Extensions" /> - <IncludeRules context="##C++11" /> + <IncludeRules context="##C++" /> </context> <!-- This context can be used from other (alternative) C++ syntax files @@ -1582,11 +1582,11 @@ <itemDatas> <itemData name="Normal Text" defStyleNum="dsNormal" spellChecking="false" /> - <itemData name="Qt4 Extensions" defStyleNum="dsNormal" spellChecking="false" /> - <itemData name="Qt4 Types" defStyleNum="dsNormal" spellChecking="false" /> - <itemData name="Qt4 Classes" defStyleNum="dsNormal" spellChecking="false" /> - <itemData name="Qt4 Functions" defStyleNum="dsNormal" spellChecking="false" /> - <itemData name="Qt4 Macros" defStyleNum="dsNormal" spellChecking="false" /> + <itemData name="Qt4 Extensions" defStyleNum="dsOthers" spellChecking="false" /> + <itemData name="Qt4 Types" defStyleNum="dsOthers" spellChecking="false" /> + <itemData name="Qt4 Classes" defStyleNum="dsOthers" spellChecking="false" /> + <itemData name="Qt4 Functions" defStyleNum="dsOthers" spellChecking="false" /> + <itemData name="Qt4 Macros" defStyleNum="dsOthers" spellChecking="false" /> </itemDatas> </highlighting> |