Merge branch 'master' of ../mainline into genericprojectmanager
No related branches found
No related tags found
Showing
- share/qtcreator/gdbmacros/gdbmacros.cpp 3 additions, 7 deletionsshare/qtcreator/gdbmacros/gdbmacros.cpp
- share/qtcreator/templates/qt4project/mywidget_form.cpp 1 addition, 1 deletionshare/qtcreator/templates/qt4project/mywidget_form.cpp
- share/qtcreator/templates/qt4project/mywidget_form.h 2 additions, 2 deletionsshare/qtcreator/templates/qt4project/mywidget_form.h
- share/qtcreator/templates/qt4project/widget.ui 2 additions, 5 deletionsshare/qtcreator/templates/qt4project/widget.ui
- src/plugins/cmakeprojectmanager/makestep.cpp 28 additions, 3 deletionssrc/plugins/cmakeprojectmanager/makestep.cpp
- src/plugins/cmakeprojectmanager/makestep.h 4 additions, 0 deletionssrc/plugins/cmakeprojectmanager/makestep.h
- src/plugins/coreplugin/mainwindow.cpp 5 additions, 4 deletionssrc/plugins/coreplugin/mainwindow.cpp
- src/plugins/debugger/debuggermanager.cpp 12 additions, 0 deletionssrc/plugins/debugger/debuggermanager.cpp
- src/plugins/debugger/debuggermanager.h 1 addition, 0 deletionssrc/plugins/debugger/debuggermanager.h
- src/plugins/debugger/gdbengine.cpp 17 additions, 0 deletionssrc/plugins/debugger/gdbengine.cpp
- src/plugins/debugger/moduleswindow.cpp 55 additions, 6 deletionssrc/plugins/debugger/moduleswindow.cpp
- src/plugins/debugger/moduleswindow.h 2 additions, 0 deletionssrc/plugins/debugger/moduleswindow.h
- src/plugins/designer/formtemplatewizardpage.cpp 5 additions, 0 deletionssrc/plugins/designer/formtemplatewizardpage.cpp
- src/plugins/designer/settingsmanager.cpp 4 additions, 4 deletionssrc/plugins/designer/settingsmanager.cpp
- src/plugins/designer/workbenchintegration.cpp 37 additions, 9 deletionssrc/plugins/designer/workbenchintegration.cpp
- src/plugins/fakevim/fakevimconstants.h 5 additions, 4 deletionssrc/plugins/fakevim/fakevimconstants.h
- src/plugins/fakevim/fakevimhandler.cpp 77 additions, 26 deletionssrc/plugins/fakevim/fakevimhandler.cpp
- src/plugins/projectexplorer/compileoutputwindow.cpp 2 additions, 2 deletionssrc/plugins/projectexplorer/compileoutputwindow.cpp
- src/plugins/projectexplorer/compileoutputwindow.h 2 additions, 2 deletionssrc/plugins/projectexplorer/compileoutputwindow.h
- src/plugins/projectexplorer/taskwindow.cpp 3 additions, 2 deletionssrc/plugins/projectexplorer/taskwindow.cpp
Loading
Please register or sign in to comment