| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Reviewed-by: hjk
|
|
|
|
| |
Reviewed-by: Roberto Raggi
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
| |
| |
| |
| | |
Reviewed-by: Roberto Raggi
|
| |
| |
| |
| |
| | |
Task-number: QTCREATORBUG-3136
Reviewed-by: Erik Verbruggen
|
|/
|
|
| |
Task-number: QTCREATORBUG-2994
|
|
|
|
| |
Reviewed-by: Roberto Raggi
|
|
|
|
|
| |
Task-number: QTCREATORBUG-2574
Reviewed-by: Roberto Raggi
|
|
|
|
|
|
| |
Reviewed-by: Roberto Raggi
Reviewed-by: Erik Verbruggen
(cherry picked from commit c2d890f65e3d1975022aec4a70a93c53e43f38bc)
|
|
|
|
| |
Task-number: QTCREATORBUG-2456
|
|
|
|
| |
Task-number: QTCREATORBUG-1517
|
| |
|
|
|
|
| |
Task-number: QTCREATORBUG-2427
|
| |
|
|
|
|
|
|
|
|
| |
There was a bug in 5cd6ebfdfd94aa9745f2ca8e92c5ed24d6bc1afa which meant
no reindent of the current line was triggered for the opening curly
brace on a new line.
Task-number: QTCREATORBUG-2331
|
| |
|
| |
|
|
|
|
|
|
|
| |
This should make the indenter less strict and annoying for non-standard
indentation styles.
Reviewed-by: Roberto Raggi
|
| |
|
|
|
|
| |
Task-number: QTCREATORBUG-2111
|
|
|
|
|
| |
This makes sure styles are consistent for the editor and the quick fix
engine.
|
|
|
|
| |
Task-number: QTCREATORBUG-1919
|
|
|
|
|
|
|
| |
Without requiring ',' to be an electric character.
Task-number: QTCREATORBUG-1866
Reviewed-by: Roberto Raggi
|
|
|
|
| |
Reviewed-by: Erik Verbruggen
|
|
|
|
|
|
|
|
| |
The lexer needs its own lexerState, before it was using
the syntax highlighter user state. This breaks the brace
depth calculation of the highlighter.
Reviewed-by: Roberto Raggi
|
| |
|
|
|
|
| |
Task-number: QTCREATORBUG-1825
|
|
|
|
| |
Task-number: QTCREATORBUG-1818
|
|
|
|
| |
Done-with: Thomas Hartmann
|
|
|
|
| |
Task-number: QTCREATORBUG-1816
|
|
|
|
|
| |
Fixes incorrect indentation we got previously when they were used in a
statement context.
|
| |
|
|
|
|
|
|
|
| |
So you now get
enum A { a = 2,
b = 3,
};
|
|
|
|
|
| |
This will allow much faster indenting of selected areas as the state
doesn't have to be checked again for every line.
|
| |
|
| |
|
|
|
|
|
| |
Keep more information by using enter() instead of turnInto() when moving
from a *_start to *_open.
|
| |
|
|
Done-with: Erik Verbruggen
|