Merge remote-tracking branch 'origin/4.5'
Change-Id: Ie83666bd18e899dabf5190c360027bf02abecdaf
No related branches found
No related tags found
Showing
- doc/src/qtquick/qtquick-modules-with-plugins.qdoc 61 additions, 19 deletionsdoc/src/qtquick/qtquick-modules-with-plugins.qdoc
- qbs/imports/QtcAutotest.qbs 5 additions, 1 deletionqbs/imports/QtcAutotest.qbs
- qbs/modules/qtc/qtc.qbs 2 additions, 0 deletionsqbs/modules/qtc/qtc.qbs
- share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp 1 addition, 1 deletion...qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
- src/libs/extensionsystem/pluginerroroverview.ui 1 addition, 1 deletionsrc/libs/extensionsystem/pluginerroroverview.ui
- src/libs/utils/bracematcher.cpp 0 additions, 119 deletionssrc/libs/utils/bracematcher.cpp
- src/libs/utils/bracematcher.h 0 additions, 66 deletionssrc/libs/utils/bracematcher.h
- src/libs/utils/utils-lib.pri 0 additions, 2 deletionssrc/libs/utils/utils-lib.pri
- src/libs/utils/utils.qbs 0 additions, 2 deletionssrc/libs/utils/utils.qbs
- src/plugins/autotest/gtest/gtesttreeitem.cpp 24 additions, 18 deletionssrc/plugins/autotest/gtest/gtesttreeitem.cpp
- src/plugins/autotest/testconfiguration.cpp 6 additions, 0 deletionssrc/plugins/autotest/testconfiguration.cpp
- src/plugins/autotest/testconfiguration.h 1 addition, 0 deletionssrc/plugins/autotest/testconfiguration.h
- src/plugins/clangcodemodel/clangactivationsequencecontextprocessor.cpp 8 additions, 4 deletions...langcodemodel/clangactivationsequencecontextprocessor.cpp
- src/plugins/clangcodemodel/clangactivationsequencecontextprocessor.h 3 additions, 1 deletion.../clangcodemodel/clangactivationsequencecontextprocessor.h
- src/plugins/clangcodemodel/clangcompletioncontextanalyzer.cpp 2 additions, 2 deletions...plugins/clangcodemodel/clangcompletioncontextanalyzer.cpp
- src/plugins/debugger/debugger.qbs 0 additions, 1 deletionsrc/plugins/debugger/debugger.qbs
- src/plugins/debugger/debuggerplugin.cpp 41 additions, 32 deletionssrc/plugins/debugger/debuggerplugin.cpp
- src/plugins/debugger/debuggerruncontrol.cpp 45 additions, 16 deletionssrc/plugins/debugger/debuggerruncontrol.cpp
- src/plugins/debugger/debuggerruncontrol.h 11 additions, 0 deletionssrc/plugins/debugger/debuggerruncontrol.h
- src/plugins/debugger/gdb/gdb.pri 2 additions, 4 deletionssrc/plugins/debugger/gdb/gdb.pri
Loading
Please register or sign in to comment