Merge remote-tracking branch 'origin/2.8' into HEAD
Conflicts: qbs/pluginspec/pluginspec.qbs Change-Id: Ic8e992623b9eda8913ee473c779a8df27643ccc9
Showing
- qbs/pluginspec/pluginspec.qbs 6 additions, 11 deletionsqbs/pluginspec/pluginspec.qbs
- share/qtcreator/dumper/gbridge.py 6 additions, 0 deletionsshare/qtcreator/dumper/gbridge.py
- share/qtcreator/dumper/lbridge.py 120 additions, 65 deletionsshare/qtcreator/dumper/lbridge.py
- share/qtcreator/dumper/qttypes.py 180 additions, 144 deletionsshare/qtcreator/dumper/qttypes.py
- share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp 3 additions, 0 deletionsshare/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp
- share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppetmain.cpp 4 additions, 0 deletionsshare/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppetmain.cpp
- share/qtcreator/translations/qtcreator_ru.ts 2887 additions, 1160 deletionsshare/qtcreator/translations/qtcreator_ru.ts
- src/libs/cplusplus/CppRewriter.cpp 1 addition, 0 deletionssrc/libs/cplusplus/CppRewriter.cpp
- src/libs/ssh/sshkeygenerator.cpp 4 additions, 0 deletionssrc/libs/ssh/sshkeygenerator.cpp
- src/libs/utils/persistentsettings.cpp 54 additions, 3 deletionssrc/libs/utils/persistentsettings.cpp
- src/plugins/android/androidsettingswidget.cpp 6 additions, 1 deletionsrc/plugins/android/androidsettingswidget.cpp
- src/plugins/android/androidsettingswidget.ui 91 additions, 51 deletionssrc/plugins/android/androidsettingswidget.ui
- src/plugins/coreplugin/progressmanager/progressbar.cpp 2 additions, 1 deletionsrc/plugins/coreplugin/progressmanager/progressbar.cpp
- src/plugins/coreplugin/progressmanager/progressmanager.cpp 17 additions, 1 deletionsrc/plugins/coreplugin/progressmanager/progressmanager.cpp
- src/plugins/coreplugin/progressmanager/progressmanager_p.h 1 addition, 0 deletionssrc/plugins/coreplugin/progressmanager/progressmanager_p.h
- src/plugins/debugger/watchdata.cpp 10 additions, 2 deletionssrc/plugins/debugger/watchdata.cpp
- src/plugins/diffeditor/diffeditorwidget.cpp 70 additions, 14 deletionssrc/plugins/diffeditor/diffeditorwidget.cpp
- src/plugins/diffeditor/diffeditorwidget.h 4 additions, 0 deletionssrc/plugins/diffeditor/diffeditorwidget.h
- src/plugins/git/branchdialog.cpp 8 additions, 4 deletionssrc/plugins/git/branchdialog.cpp
- src/plugins/git/branchdialog.h 1 addition, 0 deletionssrc/plugins/git/branchdialog.h
Loading
Please register or sign in to comment