Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Showing
- share/qtcreator/gdbmacros/gdbmacros.cpp 17 additions, 18 deletionsshare/qtcreator/gdbmacros/gdbmacros.cpp
- src/plugins/cpptools/cppcodecompletion.cpp 3 additions, 0 deletionssrc/plugins/cpptools/cppcodecompletion.cpp
- src/plugins/cpptools/cppcodecompletion.h 1 addition, 0 deletionssrc/plugins/cpptools/cppcodecompletion.h
- src/plugins/debugger/debuggermanager.cpp 2 additions, 1 deletionsrc/plugins/debugger/debuggermanager.cpp
- src/plugins/debugger/gdbengine.cpp 33 additions, 13 deletionssrc/plugins/debugger/gdbengine.cpp
- src/plugins/debugger/watchhandler.cpp 3 additions, 19 deletionssrc/plugins/debugger/watchhandler.cpp
- src/plugins/debugger/watchhandler.h 1 addition, 1 deletionsrc/plugins/debugger/watchhandler.h
- src/plugins/fakevim/fakevimhandler.cpp 1 addition, 0 deletionssrc/plugins/fakevim/fakevimhandler.cpp
- src/plugins/projectexplorer/winguiprocess.cpp 1 addition, 1 deletionsrc/plugins/projectexplorer/winguiprocess.cpp
- src/plugins/qtscripteditor/parser/javascript.g 1 addition, 1 deletionsrc/plugins/qtscripteditor/parser/javascript.g
- src/plugins/qtscripteditor/parser/javascriptengine_p.h 3 additions, 0 deletionssrc/plugins/qtscripteditor/parser/javascriptengine_p.h
- src/plugins/qtscripteditor/parser/javascriptparser.cpp 1 addition, 1 deletionsrc/plugins/qtscripteditor/parser/javascriptparser.cpp
- src/plugins/qtscripteditor/qtscriptcodecompletion.cpp 151 additions, 0 deletionssrc/plugins/qtscripteditor/qtscriptcodecompletion.cpp
- src/plugins/qtscripteditor/qtscriptcodecompletion.h 43 additions, 0 deletionssrc/plugins/qtscripteditor/qtscriptcodecompletion.h
- src/plugins/qtscripteditor/qtscripteditor.cpp 7 additions, 0 deletionssrc/plugins/qtscripteditor/qtscripteditor.cpp
- src/plugins/qtscripteditor/qtscripteditor.h 2 additions, 0 deletionssrc/plugins/qtscripteditor/qtscripteditor.h
- src/plugins/qtscripteditor/qtscripteditor.pro 4 additions, 2 deletionssrc/plugins/qtscripteditor/qtscripteditor.pro
- src/plugins/qtscripteditor/qtscripteditorplugin.cpp 21 additions, 1 deletionsrc/plugins/qtscripteditor/qtscripteditorplugin.cpp
- src/plugins/qtscripteditor/qtscripteditorplugin.h 2 additions, 0 deletionssrc/plugins/qtscripteditor/qtscripteditorplugin.h
- src/plugins/texteditor/completionsupport.cpp 13 additions, 3 deletionssrc/plugins/texteditor/completionsupport.cpp
Loading
Please register or sign in to comment