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.4'	Eike Ziller	2011-11-11	1	-2/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/libs/qmljs/qmljsinterpreter.cpp src/libs/qmljs/qmljsinterpreter.h src/plugins/debugger/qml/scriptconsole.cpp src/plugins/git/gitplugin.cpp src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
\| *	all: s/info@qt.nokia.com/qt-info@nokia.com/	hjk	2011-11-03	1	-2/+2
\| \| \| \| \| \| \| \| \| \|	Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* \|	more style fixes of string literal access	hjk	2011-11-02	1	-11/+10
\|/ \| \| \| \|	Change-Id: I60b0c53681c6a0cc38231e805479deb614aa0096 Reviewed-by: hjk <qthjk@ovi.com>
*	Fix/add copyright headers	Tobias Hunger	2011-05-06	1	-1/+1
\| \| \| \|	Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
*	Merge branch '2.2'	Oswald Buddenhagen	2011-04-14	1	-15/+15
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/plugins/debugger/gdb/pythongdbengine.cpp src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp src/plugins/qt4projectmanager/qt4target.cpp src/plugins/qt4projectmanager/qt4target.h src/plugins/qt4projectmanager/qtoptionspage.h src/plugins/qt4projectmanager/qtversionmanager.cpp src/plugins/welcome/welcomemode.cpp
\| *	Update license.	hjk	2011-04-13	1	-14/+13
\| \|
\| *	Make "Macro" options title translatable	Jarek Kobus	2011-04-11	1	-1/+2
\| \|
* \|	Remove unused constants, fix lacking virtual destructor	Jarek Kobus	2011-04-14	1	-1/+0
\|/ \| \| \|	Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
*	Add a save macro menu item, and remove the 'show save dialog' option in ↵	Nicolas Arnaud-Cormos	2011-02-07	1	-0/+1
\| \| \| \| \| \| \|	macro plugin Merge-request: 240 Reviewed-by: con <qtc-committer@nokia.com>
*	Refactor the shortcut management for plugin macros	Nicolas Arnaud-Cormos	2011-01-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	When saving a macro, a shortcut is created and the user can change the shortcut in Options->Keyboard. When the macro is removed, the shortcut is removed from the actionManager using the removeShortcut method. This is way simpler than before, where a number of default shortcuts where defined and macros took the empty space. Merge-request: 236 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
*	Macros: Fix license headers	Tobias Hunger	2010-12-20	1	-7/+11
\|
*	New plugin: plugin macro	Nicolas Arnaud-Cormos	2010-12-20	1	-0/+54
	This plugin let the user record and replay some macros: * 3 handlers: action, find and texteditor * almost all texteditor and cpp actions recorded * options page to set the directories where the macros are stored * optional dialog to give a name and comment at the end of a macro * locator integration to play a macro * shortcuts assignment to macro The most important change outside the plugin macros is the isScriptable method for command: All scriptable commands can be stored in a macro. Merge-request: 2176 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>