Christian Kamm
d0d0a8c07e
QmlJS: Fix indent of object literals.
...
Reviewed-by: Roberto Raggi
2011-04-21 12:25:15 +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
Christian Kamm
90a44ab1df
QmlJS indenter: Fix object bindings with namespaces.
...
Task-number: QTCREATORBUG-3371
Reviewed-by: Roberto Raggi
2011-01-20 11:32:25 +01:00
con
d1023c7614
It's 2011 now.
...
Reviewed-by: hjk
2011-01-12 09:46:24 +01:00
Christian Kamm
a7e5f80d70
QmlJS indenter: Only auto-reindent if indent was unchanged.
...
This change in how electric characters are handled has gone into the
C++ indenter a while ago and works well there. It means Creator is less
likely to annoyingly change the indent on lines where the
indentation whas changed manually.
It is still possible to trigger a reindent manually.
Reviewed-by: Erik Verbruggen
2011-01-04 10:23:47 +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
5f04fbba1a
QmlJS indenter: Fix for expressions starting with numbers or strings.
...
Reviewed-by: Roberto Raggi
2010-12-09 13:28:43 +01:00
Christian Kamm
b58ebe7d29
QmlJS indenter: Fix incorrect indent after break/continue.
...
Make sure to push a transitory state before leave(true) so it only
finishes the statement - and not the surrounding statement!
Reviewed-by: trustme
2010-09-30 19:03:29 +02:00
Christian Kamm
e20bfaed68
QmlJS indenter: Fix break/continue/throw in if statement without braces.
...
Reviewed-by: Roberto Raggi
2010-09-27 10:30:39 +02:00
Christian Kamm
b4bd5449f6
QmlJS indenter: Fix problem with object literals.
...
Reviewed-by: Roberto Raggi
2010-09-27 10:12:50 +02:00
Christian Kamm
822de6c17a
QmlJS: Introduce a new indenter that works similarly to the new C++ one.
...
Done-with: Thomas Hartmann
2010-08-10 14:27:08 +02:00
