Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
No related branches found
No related tags found
Showing
- doc/qtcreator.qdoc 42 additions, 4 deletionsdoc/qtcreator.qdoc
- src/plugins/qt4projectmanager/qt-s60/qt-s60-todo.txt 1 addition, 2 deletionssrc/plugins/qt4projectmanager/qt-s60/qt-s60-todo.txt
- src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp 43 additions, 3 deletions...ns/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
- src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h 6 additions, 0 deletions...gins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
- tests/manual/trk/adapter.cpp 46 additions, 37 deletionstests/manual/trk/adapter.cpp
- tests/manual/trk/launcher.cpp 642 additions, 0 deletionstests/manual/trk/launcher.cpp
- tests/manual/trk/trk.pro 1 addition, 1 deletiontests/manual/trk/trk.pro
- tests/manual/trk/trklauncher.pro 10 additions, 0 deletionstests/manual/trk/trklauncher.pro
- tests/manual/trk/trkutils.cpp 22 additions, 22 deletionstests/manual/trk/trkutils.cpp
- tests/manual/trk/trkutils.h 3 additions, 2 deletionstests/manual/trk/trkutils.h
Loading
Please register or sign in to comment