feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
22,630 Commits 108 Branches 368 Tags
be4ab29c320bbb6790eba4ab97a5d7d5ffaa7475
Commit Graph

30 Commits

Author SHA1 Message Date
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
 2011-11-11 09:46:25 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/ 
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-03 10:33:19 +01:00
Christian Kamm
909c61247c QmlJS: Allow 'var' property type. 
It's new in Qt 5.

Change-Id: If3e670d42528ca6996ae280d96077ce744d281d9
Reviewed-on: http://codereview.qt-project.org/6121
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2011-10-06 10:58:29 +02:00
Christian Kamm
cf2e3f225e QmlJS: Fix highlighting of property types. 
Task-number: QTCREATORBUG-6127
Change-Id: Iae5cd6256b2f1e792c3c91eb5915e3f082753e6e
Reviewed-on: http://codereview.qt-project.org/5136
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-19 13:52:52 +02:00
Christian Kamm
038c695991 QmlJS highlighter: Remove unused function. 
Change-Id: I7ddf5783402b0a2262be2e0142b4125db2d55cbf
Reviewed-on: http://codereview.qt-project.org/4883
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-14 13:00:36 +02:00
Christian Kamm
1a0fb751cd QmlJS highlighting: Use semantics for types and binding names. 
This fixes some problems with highlighting like anchors {}, allows us
to only highlight correct types and to make the binding name formatting
customizable.

Change-Id: I7ab0c0ed384108b74a2998796d868d5ced4a5310
Reviewed-on: http://codereview.qt-project.org/4669
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-14 11:51:35 +02:00
Christian Kamm
b729d4b973 QmlJS: Fix uses of Scanner::state(). 
Change-Id: I5195fc43e8a6653bf52c0eaa6cddb8dfd25b6217
Reviewed-on: http://codereview.qt.nokia.com/319
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
 2011-06-03 08:53:24 +02:00
Christian Kamm
f027b1da87 QmlJS: Make the Scanner recognize regular expression literals. 
Task-number: QTCREATORBUG-4566
Change-Id: I48b08f8eee79b25d0ebe186b996cdcb8f1979e3d
Reviewed-on: http://codereview.qt.nokia.com/38
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2011-05-23 08:30:26 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
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