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
Christian Kandeler
439b45618e
Start making the Maemo support more generic.
...
This includes:
- decoupling deploy configurations from targets (Reviewed-by: dt)
- adding a "Generic Linux" device type
- splitting up the Maemo deployment step into small pieces that
can be combined in different ways (and much more easily maintained)
- adding a new version handler for pro.user files
(Reviewed-by: Tobias Hunger)
Also:
- Add and use an SSH manager class for easier connection sharing.
- Make the SSH connection parameters a fixed attribute of the connection.
2011-03-09 13:10:19 +01:00
Friedemann Kleint
505256fab9
API-Documentation: Add the Utils-library.
...
Fix API after doc template change.
2011-03-02 17:14:19 +01:00
Christian Kandeler
d24ebfed3d
SSH: Fix misnomers.
2011-02-28 17:02:38 +01:00
Christian Kandeler
22a49fd4a8
SSH: Choose better names for public types and variables.
2011-02-15 13:35:17 +01:00
Milian Wolff
94548a1e1f
move src/plugins/coreplugin/ssh to src/lib/utils/ssh
...
Merge-request: 253
Reviewed-by: hjk <qtc-committer@nokia.com >
2011-02-14 16:34:17 +01:00
