Merge commit 'origin/1.2'
Showing
- dist/changes-1.2.0 25 additions, 22 deletionsdist/changes-1.2.0
- doc/examples/addressbook-sdk/part5/addressbook.cpp 27 additions, 0 deletionsdoc/examples/addressbook-sdk/part5/addressbook.cpp
- doc/examples/addressbook-sdk/part5/addressbook.h 4 additions, 0 deletionsdoc/examples/addressbook-sdk/part5/addressbook.h
- doc/examples/addressbook-sdk/part5/finddialog.cpp 23 additions, 0 deletionsdoc/examples/addressbook-sdk/part5/finddialog.cpp
- share/qtcreator/translations/qtcreator_de.ts 61 additions, 26 deletionsshare/qtcreator/translations/qtcreator_de.ts
- share/qtcreator/translations/qtcreator_es.ts 12365 additions, 0 deletionsshare/qtcreator/translations/qtcreator_es.ts
- share/qtcreator/translations/qtcreator_it.ts 1708 additions, 1258 deletionsshare/qtcreator/translations/qtcreator_it.ts
- share/qtcreator/translations/qtcreator_ja.ts 4299 additions, 3611 deletionsshare/qtcreator/translations/qtcreator_ja.ts
- share/qtcreator/translations/translations.pro 1 addition, 1 deletionshare/qtcreator/translations/translations.pro
- src/plugins/cppeditor/cppeditor.cpp 2 additions, 1 deletionsrc/plugins/cppeditor/cppeditor.cpp
- src/plugins/debugger/cdb/cdbdebugengine.cpp 6 additions, 0 deletionssrc/plugins/debugger/cdb/cdbdebugengine.cpp
- src/plugins/debugger/debuggerplugin.cpp 3 additions, 1 deletionsrc/plugins/debugger/debuggerplugin.cpp
- src/plugins/git/gitclient.cpp 7 additions, 1 deletionsrc/plugins/git/gitclient.cpp
- src/plugins/projectexplorer/environmenteditmodel.cpp 8 additions, 8 deletionssrc/plugins/projectexplorer/environmenteditmodel.cpp
- src/plugins/qtscripteditor/qtscripteditor.cpp 4 additions, 2 deletionssrc/plugins/qtscripteditor/qtscripteditor.cpp
- src/plugins/texteditor/basetexteditor.cpp 8 additions, 0 deletionssrc/plugins/texteditor/basetexteditor.cpp
- src/plugins/texteditor/fontsettingspage.cpp 16 additions, 3 deletionssrc/plugins/texteditor/fontsettingspage.cpp
- src/shared/cplusplus/AST.cpp 12 additions, 6 deletionssrc/shared/cplusplus/AST.cpp
- src/tools/qtcdebugger/main.cpp 133 additions, 6 deletionssrc/tools/qtcdebugger/main.cpp
Loading
Please register or sign in to comment