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
d7cddd4e17
VCS[Bazaar, Mercurial]: Add diff formatting, revert chunk.
...
Add toolbar controls for ignore-whitespace to editors
and wire 'Revert Chunk' context menus.
Fix Bazaar diff interaction (find the file on doubleclick).
Introduce initializeDiffEditor to BaseClient and wire the editors
there.
2011-03-28 11:59:26 +02:00
hjk
f576ad9f2c
texteditor: merge ITextEditable into ITextEditor
...
rename BastTextEditor->BaseTextEditorWidget, BaseTextEditorEditable->BaseTextEditor
rename BaseTextEditor{,Widget} subclasses
rename editableInterface->editorInterface
rename createEditableInterface->createEditor
minor cleanups after renamings
2011-02-22 11:23:53 +01:00
con
04e32b0049
License headers.
2010-12-17 16:03:42 +01:00
Friedemann Kleint
42b39023db
VCS polishing: Change context menu entry for 'Blame parent'.
...
... for git, hg as it is not obvious from the SHA1 displayed.
2010-08-13 09:12:27 +02:00
Friedemann Kleint
da6463ee2f
VCS[Mercurial]: Implement annotate previous as for git.
...
Task-number: QTCREATORBUG-503
2010-01-08 09:44:07 +01:00
Friedemann Kleint
7ce3683143
CVS: Use new VCSBasePlugin-class.
...
Make the diff-base directory a property of VCSBaseEditor and use
everywhere.
2009-12-09 12:41:10 +01:00
Friedemann Kleint
db9a967f75
Mercurial: Compile with QT_NO_CAST_FROM_ASCII, const-correctness.
2009-11-03 16:38:39 +01:00
Friedemann Kleint
5e8d179a5d
Mercurial: Compile windows, use common output window.
...
Polish: Canconical slots, const-correctness, some QLatin1Strings/tr,
2009-11-03 14:21:48 +01:00
dt
9c5271470c
Adding License to mecurial plugin
2009-11-02 18:50:06 +01:00
Brian McGillion
989e1b5acf
Mercurial plugin, merge request with suggested fixes.
2009-09-21 12:29:31 +03:00
