Merge commit 'origin/1.1' into 1.1
Showing
- share/qtcreator/gdbmacros/gdbmacros.cpp 8 additions, 6 deletionsshare/qtcreator/gdbmacros/gdbmacros.cpp
- src/plugins/coreplugin/filemanager.cpp 1 addition, 1 deletionsrc/plugins/coreplugin/filemanager.cpp
- src/plugins/coreplugin/mainwindow.cpp 15 additions, 6 deletionssrc/plugins/coreplugin/mainwindow.cpp
- src/plugins/debugger/debuggeractions.cpp 1 addition, 1 deletionsrc/plugins/debugger/debuggeractions.cpp
- src/plugins/debugger/gdbengine.cpp 32 additions, 12 deletionssrc/plugins/debugger/gdbengine.cpp
- src/plugins/debugger/gdbengine.h 1 addition, 0 deletionssrc/plugins/debugger/gdbengine.h
- src/plugins/debugger/watchhandler.cpp 0 additions, 1 deletionsrc/plugins/debugger/watchhandler.cpp
- src/plugins/debugger/watchwindow.cpp 1 addition, 3 deletionssrc/plugins/debugger/watchwindow.cpp
- src/plugins/fakevim/README 14 additions, 0 deletionssrc/plugins/fakevim/README
- src/plugins/fakevim/fakevimhandler.cpp 81 additions, 54 deletionssrc/plugins/fakevim/fakevimhandler.cpp
- src/plugins/qt4projectmanager/showbuildlog.ui 1 addition, 1 deletionsrc/plugins/qt4projectmanager/showbuildlog.ui
- src/plugins/texteditor/basetextdocument.cpp 7 additions, 6 deletionssrc/plugins/texteditor/basetextdocument.cpp
- src/shared/proparser/profileevaluator.cpp 80 additions, 55 deletionssrc/shared/proparser/profileevaluator.cpp
- src/tools/qpatch/files-to-patch-linux 19 additions, 19 deletionssrc/tools/qpatch/files-to-patch-linux
- tests/auto/debugger/main.cpp 38 additions, 0 deletionstests/auto/debugger/main.cpp
- tests/auto/fakevim/main.cpp 128 additions, 46 deletionstests/auto/fakevim/main.cpp
- tests/manual/gdbdebugger/simple/app.cpp 6 additions, 0 deletionstests/manual/gdbdebugger/simple/app.cpp
Loading
Please register or sign in to comment