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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix/add copyright headers	Tobias Hunger	2011-05-06	1	-1/+1
\| \| \| \|	Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
*	Update license.	hjk	2011-04-13	1	-14/+13
\|
*	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
\| \|
* \|	Debugger/CPP: Move helpers to simplify types to CPlusPlus-lib.	Friedemann Kleint	2010-11-25	1	-8/+178
\|/ \| \| \| \| \| \|	Make available for log simplification, etc. Add autotest, fix broken std::set and MSVC. Rubber-stamped-by: Christian Kamm <christian.d.kamm@nokia.com>
*	C++ Editor: check for method existing decl/def when inserting new ones.	Erik Verbruggen	2010-10-08	1	-0/+2
\|
*	Merge CPlusPlus::NameId and CPlusPlus::Identifier.	Roberto Raggi	2010-09-02	1	-2/+2
\|
*	Get rid of the prefix findOrInsert for the functions in CPlusPlus::Control.	Roberto Raggi	2010-08-11	1	-1/+1
\|
*	Refactored CPlusPlus::Function.	Roberto Raggi	2010-08-05	1	-1/+1
\|
*	Fixes testcase compilation	Bill King	2010-07-23	1	-1/+1
\|
*	Skip qualified and template name ids.	Roberto Raggi	2010-07-20	1	-0/+3
\|
*	Sorry this was not supposed to be committed.	Roberto Raggi	2010-07-20	1	-21/+83
\| \| \| \| \| \|	Revert "Revert "Try to fix the type rewriter."" This reverts commit c9bc1e7c64fb73e8148b65dfe7a4521121331efc.
*	Revert "Try to fix the type rewriter."	Roberto Raggi	2010-07-20	1	-83/+21
\| \| \| \|	This reverts commit 33b19f0210cd6ab1504071912caee91a95515c7c.
*	Try to fix the type rewriter.	Roberto Raggi	2010-07-19	1	-21/+83
\|
*	Disable the copy of SemanticEnvironment.	Roberto Raggi	2010-07-19	1	-7/+7
\|
*	Introduced helpers to rewrite types and names.	Roberto Raggi	2010-07-16	1	-0/+364
	Done-with: Erik Verbruggen