Merge remote branch 'origin/2.2'
Showing
- doc/maemodev.qdoc 2 additions, 2 deletionsdoc/maemodev.qdoc
- doc/qtcreator.qdoc 303 additions, 158 deletionsdoc/qtcreator.qdoc
- doc/symbiandev.qdoc 1 addition, 1 deletiondoc/symbiandev.qdoc
- share/qtcreator/gdbmacros/dumper.py 8 additions, 4 deletionsshare/qtcreator/gdbmacros/dumper.py
- share/qtcreator/translations/qtcreator_ja.ts 9147 additions, 1290 deletionsshare/qtcreator/translations/qtcreator_ja.ts
- src/libs/utils/buildablehelperlibrary.cpp 12 additions, 7 deletionssrc/libs/utils/buildablehelperlibrary.cpp
- src/libs/utils/buildablehelperlibrary.h 2 additions, 1 deletionsrc/libs/utils/buildablehelperlibrary.h
- src/plugins/debugger/cdb/cdbparsehelpers.cpp 4 additions, 2 deletionssrc/plugins/debugger/cdb/cdbparsehelpers.cpp
- src/plugins/debugger/gdb/gdbengine.cpp 2 additions, 1 deletionsrc/plugins/debugger/gdb/gdbengine.cpp
- src/plugins/projectexplorer/debugginghelper.cpp 1 addition, 1 deletionsrc/plugins/projectexplorer/debugginghelper.cpp
- src/plugins/qt4projectmanager/qmldebugginglibrary.cpp 1 addition, 1 deletionsrc/plugins/qt4projectmanager/qmldebugginglibrary.cpp
- src/plugins/qt4projectmanager/qmldumptool.cpp 14 additions, 7 deletionssrc/plugins/qt4projectmanager/qmldumptool.cpp
- src/plugins/qt4projectmanager/qmldumptool.h 2 additions, 1 deletionsrc/plugins/qt4projectmanager/qmldumptool.h
- src/plugins/qt4projectmanager/qmlobservertool.cpp 1 addition, 1 deletionsrc/plugins/qt4projectmanager/qmlobservertool.cpp
- src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.cpp 1 addition, 2 deletionssrc/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.cpp
- src/plugins/qt4projectmanager/qtversionmanager.cpp 6 additions, 2 deletionssrc/plugins/qt4projectmanager/qtversionmanager.cpp
Loading
Please register or sign in to comment