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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/2.6'	Oswald Buddenhagen	2013-01-31	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp src/plugins/qmldesigner/designercore/include/widgetqueryview.h src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp src/plugins/qnx/bardescriptormagicmatcher.h src/plugins/qt4projectmanager/profilekeywords.cpp src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
\| *	Incremented year in copyright infov2.6.2	Robert Loehning	2013-01-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* \|	Highlight macro definitions like other uses.	Francois Ferrand	2013-01-23	1	-1/+11
\|/ \| \| \| \|	Change-Id: I5a0852e5c1e154b52d712f1dfcfe2fc04e0eb9fb Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
*	Adjust license headers	hjk	2012-10-05	1	-21/+20
\| \| \| \| \|	Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
*	Contact -> qt-project.org	Eike Ziller	2012-07-19	1	-3/+1
\| \| \| \| \|	Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
*	C++: Enable C++11 keywords in macro uses	Leandro Melo	2012-06-28	1	-0/+1
\| \| \| \| \| \| \|	Just in case compilers id defining such things. Change-Id: Ica6af8462e90bfab2bfa883ec12d5e648d6d33db Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
*	CppHighlighter: highlight macro references.	Francois Ferrand	2012-04-13	1	-1/+29
\| \| \| \| \|	Change-Id: I7c90957aa67e03a109af0a722160d4e1c759d716 Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
*	C++: make highlighting/completion plugable.	Erik Verbruggen	2012-02-20	1	-0/+66
	Change-Id: I990fdf5411153041c6b4c62f31b453342d59de53 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>