feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
19,218 Commits 108 Branches 368 Tags
362aef67e005a93172f4de2a61a80e433ac11463
Commit Graph

22 Commits

Author SHA1 Message Date
Friedemann Kleint
a3c9cb995d Compile fix 
Change-Id: I8f3eb7d21074fec00de870d33e493842286222ee
Reviewed-on: http://codereview.qt.nokia.com/51
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-05-23 08:49:03 +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
Friedemann Kleint
edb4893547 Header cleanup in src, specify module name. 2011-01-24 12:29:48 +01: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
Rhys Weatherley
a9a7f0458f Fix syntax highlighting of multiline QMLJS strings 2010-11-29 09:57:16 +01:00
Christian Kamm
f6232260c2 QmlJS: Adjust scanner to treat ++ and -- as a single delimiter token. 
Reviewed-by: Roberto Raggi
 2010-08-10 14:14:17 +02:00
Christian Kamm
a2ae7eae4c Qml scanner: Don't emit token for empty line in multi-line comment. 
Done-with: Thomas Hartmann
 2010-07-08 14:32:02 +02:00
Christian Kamm
db9b630b48 Qml scanner: Fix begin location of comment tokens in multiline comments. 
Done-with: Thomas Hartmann
Reviewed-by: Roberto Raggi
 2010-07-08 14:20:30 +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
Christian Kamm
b2bb919e45 QmlJSEditor: Add completion for JS keywords and Qml reserved words. 
Task-number: QTCREATORBUG-919
Reviewed-by: Roberto Raggi
 2010-03-26 13:51:46 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Roberto Raggi
fd26a8c8ec Get rid of the QmlJS prefix. 2010-02-15 12:56:03 +01:00
Roberto Raggi
04161a4ced Introduced QmlJSScanner::scanComments/setScanComments(onoff). 2010-01-29 15:05:22 +01:00
Roberto Raggi
14207aa856 Fixed highlihing of QML context keywords. 2010-01-29 11:20:42 +01:00
Roberto Raggi
2dd5bebd12 Skip white spaces. 2010-01-29 09:48:21 +01:00
Roberto Raggi
fa925ccd5a Say hello to the new incremental scanner for QML/JS. 2010-01-28 13:13:23 +01:00
Roberto Raggi
60ad6c478c Moved QmlJSScanner::Token in the QmlJS namespace. 2010-01-19 12:54:17 +01:00
Roberto Raggi
c943d8e4f1 Renamed classes and files to use the QmlJS prefix. 2010-01-18 16:59:20 +01:00