feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
18,741 Commits 108 Branches 368 Tags
f8ef0fac136d48e4ddc1df260bab4344ca812bc8
Commit Graph

21 Commits

Author SHA1 Message Date
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
con
b1bcf081d8 Merge branch '2.1' 
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
 2010-12-17 17:00:53 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Christian Kamm
60bafeb81d QmlJS: Highlighter now marks capitalized identifiers as types. 
Task-number: QTCREATORBUG-2658
Reviewed-by: Roberto Raggi
 2010-11-10 11:08:36 +01:00
Thorbjørn Lindeijer
382b59a5db Use Field instead of Label format for QML properties 
In the default style this is currently the same, but in general it makes
more sense to highlight properties as fields.
 2010-08-03 11:37:11 +02:00
Roberto Raggi
8acde74d79 Forked QSyntaxHighlighter from Qt 4.7. 
We need our very own syntax highlighter in Qt Creator.
 2010-07-09 14:47:18 +02:00
Christian Kamm
7bf0ff8dc2 Merge branch '2.0' 
Conflicts:
	src/plugins/qmljseditor/qmljshighlighter.cpp
 2010-06-15 14:37:46 +02:00
Christian Kamm
983ed48ae3 QmlJS: Don't unnecessarily store the multiline comment state. 
The 'state' value already holds the same information.

Reviewed-by: Erik Verbruggen
(backport of 70448b016d)
 2010-06-15 14:34:18 +02:00
Christian Kamm
70448b016d QmlJS: Don't unnecessarily store the multiline comment state. 
The 'state' value already holds the same information.

Reviewed-by: Erik Verbruggen
 2010-06-15 14:29:45 +02:00
Erik Verbruggen
e5b9c76f27 Added C-style comment folding. 
This is a "back-port" for 57f2b3e44d from master
into 2.0.

Done-with: ckamm
 2010-06-15 11:27:07 +02:00
hjk
0ee6115998 qmljshighlighter: un-templatize setFormats() 
This is used excatly once.

ReviewedBy: Kai Koehne
 2010-06-04 11:17:55 +02:00
Christian Kamm
68cec6a7c7 QmlJS: Fix folding information for multi-line comments after edits. 
Since the highlighter doesn't run on the whole file, only on the changed
line, we need to store the information whether a block starts in a
multi-line comment.

Reviewed-by: Erik Verbruggen
 2010-05-28 13:50:52 +02:00
Christian Kamm
57f2b3e44d QmlJS: Allow folding of multi-line comments. 
This also makes the editor auto-fold the license comment.

Task-number: QTCREATORBUG-1455
Reviewed-by: Erik Verbruggen
 2010-05-27 12:56:44 +02:00
mae
e07c34017e Rework code folding 
The new and cleaner foldingIndent in the block user data will
make it easier to support other kinds of indentation for various
other programming languages (like Python).
 2010-05-20 15:11:31 +02:00
Christian Kamm
e145c6ae53 QmlJSEditor: Fix brace matching for "A on b {" syntax. 
Reviewed-by: Roberto Raggi
 2010-04-15 15:38:20 +02:00
Christian Kamm
b19c51d609 QmlJSEditor: Highlight b in 'A on b {' as a property. 
Fixes 4f1d5ce196

Task-number: QTCREATORBUG-893
Reviewed-by: Erik Verbruggen
 2010-04-07 11:45:00 +02:00
Christian Kamm
4f1d5ce196 QmlJSEditor: Highlight 'A on B {' correctly. 
* Add 'on' qml-keyword.
* Highlight the last identifier before 'on' as a type.

Task-number: QTCREATORBUG-893
Reviewed-by: Erik Verbruggen
 2010-04-07 11:09:26 +02:00
Lasse Holmstedt
90abf1bf2d Highlighting and more sensible watchers to qml inspector 2010-03-17 11:38:09 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Roberto Raggi
8fb82ef792 Merge qmljshighlighter.* with qmlhighlighter.*. 2010-02-15 12:39:30 +01:00