delta/qt-creator.git - code.qt.io: qt-creator/qt-creator.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	texteditor: merge ITextEditable into ITextEditor	hjk	2011-02-22	1	-1/+1
\| \| \| \| \| \| \| \|	rename BastTextEditor->BaseTextEditorWidget, BaseTextEditorEditable->BaseTextEditor rename BaseTextEditor{,Widget} subclasses rename editableInterface->editorInterface rename createEditableInterface->createEditor minor cleanups after renamings
*	Exported header cleanup.	Friedemann Kleint	2011-01-20	1	-0/+1
\|
*	It's 2011 now.	con	2011-01-12	1	-1/+1
\| \| \| \|	Reviewed-by: hjk
*	Merge branch '2.1'	con	2010-12-17	1	-7/+11
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	License headers.	con	2010-12-17	1	-7/+11
\| \|
* \|	VCS: Handle code folding in diff view	Tobias Hunger	2010-11-22	1	-1/+1
\|/ \| \| \|	Allow to do codefolding on files and hunks in the diff editor
*	VCS polishing: Change context menu entry for 'Blame parent'.	Friedemann Kleint	2010-08-13	1	-0/+1
\| \| \| \|	... for git, hg as it is not obvious from the SHA1 displayed.
*	VCS[git]: Introduce optional pull --rebase.	Friedemann Kleint	2010-03-19	1	-1/+1
\| \| \| \|	Do 'git rebase --abort' if something fails.
*	Long live the king!	hjk	2010-03-05	1	-1/+1
\|
*	VCS[git]: Add log repository action.	Friedemann Kleint	2010-01-08	1	-1/+1
\|
*	Make method naming more consistent.	Tobias Hunger	2010-01-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	* Use id() for methods returning a string used to represent some type of object. * Use displayName() for strings that are meant to be user visible. * Quieten some warnings while touching the files anyway. * Move Factories to their products in the plugins where that was not done before. Reviewed-by: dt
*	VCS [git]: Annotate previous version/single filelog annotation.	Friedemann Kleint	2010-01-07	1	-1/+25
\| \| \| \|	Task-number: QTCREATORBUG-503
*	CVS: Use new VCSBasePlugin-class.	Friedemann Kleint	2009-12-09	1	-10/+4
\| \| \| \| \|	Make the diff-base directory a property of VCSBaseEditor and use everywhere.
*	VCS/git: Make blame go to current editor line	Friedemann Kleint	2009-10-01	1	-0/+9
\| \| \| \|	using queued slot/variant cookie magic in command
*	long live the king	hjk	2009-08-14	1	-1/+1
\|
*	Optionally shorten git blame output by removing date+line number.	Friedemann Kleint	2009-07-15	1	-0/+43
\|
*	Update license headers and sales contact details.	Jason McDonald	2009-06-17	1	-2/+2
\| \| \| \|	Reviewed-by: Trust Me
*	Fixes: change file license headers to include LGPL	hjk	2009-02-25	1	-21/+17
\|
*	Bump year in licence header.	Daniel Molkentin	2009-01-13	1	-1/+1
\|
*	chancge Nokia GPL exception version from 1.2 to 1.3	hjk	2008-12-16	1	-1/+1
\|
*	use QTC_ASSERT instead of Q_ASSERT	hjk	2008-12-09	1	-11/+14
\|
*	more file cosmetics	hjk	2008-12-02	1	-2/+3
\|
*	off-by-one in headers	hjk	2008-12-02	1	-1/+0
\|
*	end-of-line whitespace correction of the new headers	hjk	2008-12-02	1	-10/+11
\|
*	Initial import	con	2008-12-02	1	-0/+145