summaryrefslogtreecommitdiff
path: root/src/plugins/qmljseditor/qmljshighlighter.cpp
Commit message (Expand)AuthorAgeFilesLines
* Incremented year in copyright infoRobert Loehning2014-01-081-1/+1
* Merge remote-tracking branch 'origin/2.8'Oswald Buddenhagen2013-08-271-0/+8
|\
| * qmljs: add vector*d, quaternion, and matrix4x4 to code modelFawzi Mohamed2013-08-221-0/+8
* | Add common interface for text formats inside syntax highlighterjkobus2013-08-261-17/+22
|/
* Remove unneeded typedefsKai Koehne2013-04-021-2/+0
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-311-1/+1
|\
| * Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
* | Remove braces for single lines of conditionsOrgad Shaneh2013-01-081-30/+28
* | QmlJSEditor: Compile with QT_NO_CAST_FROM_ASCIIOrgad Shaneh2012-12-031-8/+8
|/
* Adjust license headershjk2012-10-051-21/+20
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
* Removed module names from #include directives.Erik Verbruggen2012-02-151-3/+3
* Long live the king!hjk2012-01-261-1/+1
* Merge remote-tracking branch 'origin/2.4'Eike Ziller2011-11-111-2/+2
|\
| * all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-031-2/+2
* | QmlJS: Allow 'var' property type.Christian Kamm2011-10-061-0/+2
|/
* QmlJS: Fix highlighting of property types.Christian Kamm2011-09-191-7/+23
* QmlJS highlighter: Remove unused function.Christian Kamm2011-09-141-15/+0
* QmlJS highlighting: Use semantics for types and binding names.Christian Kamm2011-09-141-48/+0
* QmlJS: Fix uses of Scanner::state().Christian Kamm2011-06-031-2/+2
* QmlJS: Make the Scanner recognize regular expression literals.Christian Kamm2011-05-231-1/+6
* Fix/add copyright headersTobias Hunger2011-05-061-1/+1
* Update license.hjk2011-04-131-14/+13
* It's 2011 now.con2011-01-121-1/+1
* Merge branch '2.1'con2010-12-171-7/+11
|\
| * License headers.con2010-12-171-7/+11
* | QmlJS: Highlighter now marks capitalized identifiers as types.Christian Kamm2010-11-101-10/+17
|/
* Use Field instead of Label format for QML propertiesThorbjørn Lindeijer2010-08-031-6/+1
* Forked QSyntaxHighlighter from Qt 4.7.Roberto Raggi2010-07-091-1/+1
* Merge branch '2.0'Christian Kamm2010-06-151-1/+1
|\
| * QmlJS: Don't unnecessarily store the multiline comment state.Christian Kamm2010-06-151-4/+4
| * Added C-style comment folding.Erik Verbruggen2010-06-151-8/+24
* | QmlJS: Don't unnecessarily store the multiline comment state.Christian Kamm2010-06-151-3/+3
* | qmljshighlighter: un-templatize setFormats()hjk2010-06-041-0/+6
* | QmlJS: Fix folding information for multi-line comments after edits.Christian Kamm2010-05-281-2/+4
* | QmlJS: Allow folding of multi-line comments.Christian Kamm2010-05-271-3/+13
* | Rework code foldingmae2010-05-201-44/+32
|/
* QmlJSEditor: Fix brace matching for "A on b {" syntax.Christian Kamm2010-04-151-6/+6
* QmlJSEditor: Highlight b in 'A on b {' as a property.Christian Kamm2010-04-071-2/+17
* QmlJSEditor: Highlight 'A on B {' correctly.Christian Kamm2010-04-071-1/+6
* Highlighting and more sensible watchers to qml inspectorLasse Holmstedt2010-03-171-1/+0
* Long live the king!hjk2010-03-051-1/+1
* Merge qmljshighlighter.* with qmlhighlighter.*.Roberto Raggi2010-02-151-0/+344