Friedemann Kleint
|
88f333267f
|
Fix Krazy code scanning tool warnings (QString, loops, spelling).
|
2011-02-25 15:28:01 +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 |
|
Erik Verbruggen
|
6a5f06d463
|
Retain id when creating a component from an object.
Task-number: QTCREATORBUG-2666
Reviewed-by: Christian Kamm
|
2010-11-11 12:12:21 +01:00 |
|
Christian Kamm
|
f366754462
|
Move shared code to a new QmlJSTools plugin.
Reviewed-by: Thomas Hartmann
|
2010-11-11 11:49:10 +01:00 |
|
Erik Verbruggen
|
5e59605c1e
|
QMLEditor: changed quickfix to only activate on the type id.
|
2010-09-30 16:12:54 +02:00 |
|
Erik Verbruggen
|
6622947c15
|
QML editor: also check for objectName property when guessing the name.
|
2010-09-23 13:28:15 +02:00 |
|
Erik Verbruggen
|
825562eb74
|
QML Editor: changed extract-component to ask for a name if there is no id.
|
2010-09-23 13:28:14 +02:00 |
|
Christian Kamm
|
7a5df3c39d
|
QuickFix: Move helpers from QuickFixData to RefactoringFile.
Makes them easy to use everywhere. Also when calling
QuickFixData::textOf and friends, it wasn't really clear which file
they would run on.
|
2010-08-13 12:51:22 +02:00 |
|
Christian Kamm
|
538f611503
|
Indenters: Move style setup into the QtStyleCodeFormatter constructors.
This makes sure styles are consistent for the editor and the quick fix
engine.
|
2010-08-12 14:21:35 +02:00 |
|
Christian Kamm
|
0355e37e53
|
QuickFix: Migrate to a nicer API for cross-file quick fixes.
|
2010-08-12 14:21:35 +02:00 |
|
Christian Kamm
|
ca5076e5ae
|
QuickFix: Don't separate createChanges from perform.
This will allow a more efficient and direct implementation.
|
2010-08-12 14:21:35 +02:00 |
|
Erik Verbruggen
|
9b656eb1de
|
Changed the description to include the new file name.
|
2010-07-27 09:59:59 +02:00 |
|
Erik Verbruggen
|
c8016e8502
|
Put the quickfix implementations into a separate file.
|
2010-07-27 09:29:22 +02:00 |
|
Erik Verbruggen
|
d980e37e24
|
Reworked the QuickFix infrastructure.
|
2010-07-26 13:07:19 +02:00 |
|
Roberto Raggi
|
eb749ec3a2
|
Generalized the changeset operations.
|
2010-06-22 12:13:30 +02:00 |
|
Erik Verbruggen
|
54ea41af47
|
Removed implicit change set and related utility methods.
|
2010-06-15 10:22:28 +02:00 |
|
Erik Verbruggen
|
81c7f4f166
|
Removed qDebug.
|
2010-06-14 18:10:03 +02:00 |
|
Erik Verbruggen
|
f3faf34db9
|
Removed implicit change set and related utility methods.
|
2010-06-14 17:16:45 +02:00 |
|
Erik Verbruggen
|
41bb1a8b86
|
Added refactoring action to create component from object definition.
|
2010-06-14 15:03:10 +02:00 |
|