feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
17,084 Commits 108 Branches 368 Tags
e32cf192f7ba34dda96b61507b440c6a17b51a0c
Commit Graph

20 Commits

Author SHA1 Message Date
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
Roberto Raggi
ea5d923fe0 Don't waste time rehighlighting all the files opened in Creator. 2010-12-14 15:06:01 +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
Christian Kamm
3f505e9982 QmlJS: Add initial 'Find Usages' support. 2010-09-24 14:11:06 +02:00
Kai Koehne
0f4a66e785 Compilation fix 
Remove method declaration. This is a remainder of merge
ef1e52d.
 2010-08-24 08:57:48 +02:00
Thomas Hartmann
b193b3598f QmlJSEditor: add shortcut for Qt Quick Helper (ctrl+alt+space) 
This shortcut forces the Qt Quick Helper to be shown if
available. The action is also registered in the context menu
so it is discoverable.


Reviewed-by: Christian Kamm
 2010-08-04 14:03:09 +02:00
dt
3ef43f56c7 Move qmltaskmanager from qmlproject plugin to qmljseditor 2010-07-14 13:01:43 +02:00
Kai Koehne
ce32f25ba3 QmlOutline: Show icons for known types 2010-07-14 11:40:11 +02:00
hjk
c7e8b51d37 core: use a class derived from QList<int> instead of a QList<int> for Core::Context 
A mostly mechanical change.

Reviewed-By: con
 2010-06-25 12:58:07 +02:00
Roberto Raggi
726c3345c4 Moved qmljsmodelmanagerinterface.h 2010-06-10 11:59:27 +02:00
Roberto Raggi
21073563a4 Introduced quickfix support for QML/JS files. 2010-06-03 15:52:50 +02:00
Thorbjørn Lindeijer
e53b5bc9a1 Fixed completion settings to also apply to the QML code completion 
By moving the completion settings into the TextEditor plugin, so that
both the CppTools and the QmlJSEditor plugins can access the settings.

The user-interface to edit the settings is still in the CppTools plugin,
since we're in string freeze at the moment. It should be moved to the
TextEditor plugin later.

For now the QML completion only supports the case-sensitivity and
partial completion options, since there is no automatic insertion of
brackets.

Task-number: QTCREATORBUG-1327
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2010-05-11 15:11:12 +02:00
Lasse Holmstedt
21fbbc2c15 Added preview menu and shortcuts for qt quick (Ctrl+Alt+R) 
This was needed since we cannot start stuff otherwise without a project

Task-number: BAUHAUS-450
Reviewed-by: kkoehne
 2010-04-23 13:20:44 +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
d22610c724 Renamed qmlcodecompletion. 2010-02-15 13:39:41 +01:00
Roberto Raggi
967ed09c29 Initial support of `Follow symbol under cursor' for QML/JS. 2010-02-09 11:37:58 +01:00
Erik Verbruggen
96e31c2a0f Started merging the JS and QML editor plug-ins. 2010-01-15 17:20:19 +01:00