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
Christian Kamm
e641bfbd9a
QmlJS: Set default import paths in constructor.
...
Also, remove the import path of the Qt that Creator was built with. It
might make things seem to work on built-from-source Creators that will
fail when Creator is shipped.
Reviewed-by: Erik Verbruggen
2010-12-09 09:46:47 +01:00
Christian Kamm
5dd92328fb
QmlJS: Improve error reporting for failed plugin dumps.
...
Reviewed-by: Erik Verbruggen
2010-11-25 15:06:44 +01:00
Christian Kamm
8f27c43877
QmlJS: Don't use full mime type detection to decide between qml/js.
...
Determining the mime type is too expensive - and for deciding between
qml and js files comparing suffixes is sufficient.
Reviewed-by: Friedemann Kleint
2010-11-25 15:06:44 +01:00
Christian Kamm
2b1fe08641
QmlJS: Move plugin dumping code and redump on file change.
...
Task-number: QTCREATORBUG-3047
Reviewed-by: Erik Verbruggen
2010-11-11 12:27:50 +01:00
Thomas Hartmann
e9fd078e45
Getting the QmlJsModelManager working stand alone
...
Getting the QmlJsModelManager working stand alone
for auto testing
Reviewed-by: Christian Kamm
2010-11-11 11:49:11 +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
