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>
* \|	Set NoQt as qt version for non-qt projects	Sergey Shambir	2012-12-12	1	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I292357c84f3633ffc3cb17f44b66d6de9c268966 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* \|	C++: Remove hard-coded configuration file name.	Erik Verbruggen	2012-12-04	1	-0/+4
\| \| \| \| \| \| \| \| \| \|	Change-Id: Ibe4cc69eafd14dab7707862b1068ce1e21b1d8e0 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* \|	C++: ProjectParts now contain everything that gets linked together.	Erik Verbruggen	2012-11-28	1	-0/+4
\|/ \| \| \| \|	Change-Id: Ib862e51897156a03a4a45e2a1690b00caeb03518 Reviewed-by: Daniel Teske <daniel.teske@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>
*	Move the ModelManagerInterface out of the CPlusPlus library.	Erik Verbruggen	2012-03-14	1	-0/+99
	Change-Id: Iffaa18f848a22f6961b49dff048672b194570df6 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>