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
Tobias Hunger
9b18a58ae5
s/name/displayName/ in ioutputpane
...
Reviewed-by: dt
2010-06-16 13:08:40 +02:00
Friedemann Kleint
5364f5c152
VCS: Show message box on timeouts/Add SSH prompt.
...
- Use message boxes on timeouts.
- Add a configuration for a graphical SSH password prompt binary with
defaults
- Launch commands that require authentification with no terminal on UNIX
and environment variable SSH_ASKPASS set accordingly.
- First attempt at introduce a common function to synchronously run VCS
commands in base plugin with flags.
- Use standard execution log entries in all VCS plugins (outputwindow).
2010-05-21 17:46:00 +02:00
hjk
9595504bda
Long live the king!
2010-03-05 11:28:13 +01:00
Friedemann Kleint
730fd82ac8
VCS: Add "Open file" context menu action to VCS log pane
...
to be used for status/opened output. enabling convenient opening.
Append repository as block data to log text to be able to resolve
relative paths.
2009-12-15 14:20:06 +01:00
Friedemann Kleint
74a3828f19
Purge out include files in exported headers
2009-10-01 16:38:08 +02:00
hjk
93cbef8724
long live the king
2009-08-14 09:30:56 +02:00
Friedemann Kleint
1e64d9f9b2
Version control: Replace per-VCS output panes with a single one.
...
...and give it some color and formatting.
2009-08-10 15:46:45 +02:00
