Tobias Hunger
aa2acec14c
Fix/add copyright headers
...
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
Friedemann Kleint
774fa49412
Fix more krazy warnings.
2011-04-19 15:43:53 +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
62dba8e4c1
QmlJS: Fix incorrect completion inside 'Item\n{ ... }'.
...
The newline made the linizer add an automatic semicolon after Item,
causing the completion context finder to not recognize it as an object
definition.
Task-number: QTCREATORBUG-2658
Reviewed-by: Roberto Raggi
2010-11-10 11:08:36 +01:00
Christian Kamm
44a155c612
QmlJS: Fix completion context when cursor is to the right of inserted ;
...
Done-with: Erik Verbruggen
2010-04-30 14:22:55 +02:00
Erik Verbruggen
0970a8e6d2
Moved quick-exit check back to the indenter.
...
Reviewed-by: ckamm
2010-04-30 13:36:09 +02:00
Christian Kamm
61c1ac37a0
QmlJS: Don't put automatic semicolons directly after colons.
...
Done-with: Erik Verbruggen
2010-04-29 16:05:24 +02:00
Christian Kamm
722ba33770
QmlJS: Add CompletionContextFinder to allow context sensitive completion
...
The plan is to use this to reduce the number of applicable
completion options, for instance for enum completion or property
names.
Done-with: Erik Verbruggen
2010-04-29 16:05:24 +02:00
Christian Kamm
bd71243407
QmlJS: Move parts of the indenter to the new LineInfo.
...
LineInfo can tell whether lines are finished or not.
Done-with: Erik Verbruggen
2010-04-29 16:05:24 +02:00
