Oswald Buddenhagen
dc3c156cac
Merge branch '2.2'
...
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
2011-04-14 12:39:31 +02:00
hjk
8397663964
Update license.
2011-04-13 11:49:28 +02:00
Friedemann Kleint
58111b2df2
API Documentation: Add VCSBase.
2011-03-28 14:19:17 +02:00
con
d1023c7614
It's 2011 now.
...
Reviewed-by: hjk
2011-01-12 09:46:24 +01:00
con
04e32b0049
License headers.
2010-12-17 16:03:42 +01:00
dt
08ccda5862
EditorManager: Change openEditor/activateEditor to not do mode switching
...
Also introduce a indirection, modes have now types, edit and debug have
the same type, and editors do have a prefered type of modes instead of a
prefered mode.
That fixes the bug that if the prefered qml editing mode was set to
design, then in switching between qml editors would
- in Edit Mode: stay in edit mode
- in Debug Mode: switch to debug mode
2010-09-14 15:23:11 +02:00
Friedemann Kleint
c3eb4b6611
VCS: Windows slash display fixing spree.
...
Task-number: QTCREATORBUG-1795
2010-07-05 09:52:32 +02:00
Friedemann Kleint
288ece116a
VCS[git]: Add "Clean project"
...
in the same fashion as "Clean repository".
2010-03-15 09:18:24 +01:00
Friedemann Kleint
f4487c4c67
VCS[git]: Cleaning a repositories: Uncheck pro.user files as well.
2010-03-12 15:59:50 +01:00
Friedemann Kleint
93b156e585
VCS[git]: Add support for cleaning a repository.
...
Present user with a checkable list of files to be cleaned (add reusable
dialog to VCSBase module).
2010-03-12 15:54:09 +01:00
