hjk
5805788290
Merge remote branch 'origin/2.0'
...
Conflicts:
src/plugins/projectexplorer/miniprojecttargetselector.cpp
src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp
src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
tests/manual/gdbdebugger/simple/app.cpp
2010-05-27 11:11:53 +02:00
Robert Loehning
91cd56e0c6
Anticipatory code fix, will currently not affect behavior.
...
appendDataSilently() is only called from appendData() which is not
silent anyway. The connect in GitClient::createCommand() is currently
not executed.
2010-05-21 19:42:26 +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
0e62a1c678
VCSBase: Fix assert about log window widget being 0.
...
...when p4 initialization fails on Windows.
2010-02-12 14:41:19 +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
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
