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
|
dc6874acb8
|
SSH: Adapt tests to API change.
|
2011-04-06 10:31:42 +02:00 |
|
Christian Kandeler
|
afa13623cd
|
SSH: Fix tests to adapt to new location (utils vs. core plugin).
|
2011-04-01 09:58:29 +02:00 |
|
Bill King
|
3593fe08ae
|
tests: add licence headers
|
2011-02-18 14:48:16 +01:00 |
|
Christian Kandeler
|
1d3c08dabb
|
SSH: Declare signal parameter with full namespace.
Otherwise we can't sensibly declare slots with a matching parameter.
|
2010-10-06 10:10:11 +02:00 |
|
Christian Kandeler
|
d778af3b55
|
SSH: Finish Implementing SFTP test.
|
2010-10-05 16:10:24 +02:00 |
|
Christian Kandeler
|
3d90463dd4
|
SSH: Implement first half of SFTP test.
|
2010-10-05 16:10:24 +02:00 |
|
Christian Kandeler
|
4578e32fe5
|
Tests: Start implementing more thorough SSH test.
|
2010-10-04 17:54:46 +02:00 |
|