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
740eb6a987
QmlJS: Implement context help and tooltips for properties.
2010-11-17 14:50:14 +01:00
Friedemann Kleint
77008bc45f
Exported Header cleanup: QmlJSEditor
...
Move internal classes QmlJSEditorEditable/SemanticHighlighter
out of qmljseditor.h. Move QmlJSEditor from namespace
QmlJSEditor::Internal to QmlJSEditor.
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com >
2010-11-02 11:10:27 +01:00
Leandro Melo
ba12a3390e
Refactor how base hover handler manipulates the help items (qt docs interaction).
2010-08-31 19:04:52 +02:00
Christian Kamm
898098c1f2
QmlJS: Allow lookups on const Contexts. Pass const Contexts where ok.
...
In preparation for caching Contexts.
Reviewed-by: Erik Verbruggen
2010-08-25 11:53:23 +02:00
Leandro Melo
ced86184fa
Create a base hover handler.
2010-08-03 15:49:32 +02:00
Leandro Melo
1530273671
Color tip for QML; Start of a bit more extensible tooltip class.
2010-08-02 14:56:55 +02:00
con
30fae3eab1
Merge remote branch 'origin/2.0'
...
Conflicts:
doc/qtcreator.qdoc
src/plugins/projectexplorer/taskwindow.h
src/plugins/qmldesigner/designercore/model/modelmerger.cpp
src/plugins/qmljseditor/qmljshoverhandler.h
src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
src/plugins/subversion/subversionplugin.cpp
2010-06-11 16:30:39 +02:00
kh1
1b6ad08795
Move help manager into core.
...
- lessens open file handles
- improves help plugin startup further
Task-number: QTCREATORBUG-337
Reviewed-by: ck
2010-06-11 13:11:37 +02:00
Roberto Raggi
726c3345c4
Moved qmljsmodelmanagerinterface.h
2010-06-10 11:59:27 +02:00
hjk
9595504bda
Long live the king!
2010-03-05 11:28:13 +01:00
Roberto Raggi
2a63387085
Renamed qmlmodelmanager.
2010-02-15 13:49:00 +01:00
Roberto Raggi
52b04f5d99
Renamed qmlhoverhandler.
2010-02-15 13:42:58 +01:00
