Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- doc/example/textfinder/textfinder.cpp 14 additions, 15 deletionsdoc/example/textfinder/textfinder.cpp
- doc/example/textfinder/textfinder.h 6 additions, 10 deletionsdoc/example/textfinder/textfinder.h
- doc/example/textfinder/textfinder.ui 2 additions, 2 deletionsdoc/example/textfinder/textfinder.ui
- doc/qtcreator.qdoc 22 additions, 41 deletionsdoc/qtcreator.qdoc
- doc/qtcreator.qdocconf 1 addition, 0 deletionsdoc/qtcreator.qdocconf
- src/libs/cplusplus/LookupContext.cpp 9 additions, 4 deletionssrc/libs/cplusplus/LookupContext.cpp
- src/libs/cplusplus/pp-engine.cpp 4 additions, 0 deletionssrc/libs/cplusplus/pp-engine.cpp
- src/libs/utils/consoleprocess.h 2 additions, 0 deletionssrc/libs/utils/consoleprocess.h
- src/libs/utils/submiteditorwidget.cpp 0 additions, 3 deletionssrc/libs/utils/submiteditorwidget.cpp
- src/plugins/cppeditor/cppeditor.cpp 67 additions, 37 deletionssrc/plugins/cppeditor/cppeditor.cpp
- src/plugins/cppeditor/cppeditor.h 7 additions, 1 deletionsrc/plugins/cppeditor/cppeditor.h
- src/plugins/debugger/breakwindow.cpp 1 addition, 0 deletionssrc/plugins/debugger/breakwindow.cpp
- src/plugins/debugger/cdb/cdb.pri 6 additions, 2 deletionssrc/plugins/debugger/cdb/cdb.pri
- src/plugins/debugger/cdb/cdbdebugengine.cpp 21 additions, 5 deletionssrc/plugins/debugger/cdb/cdbdebugengine.cpp
- src/plugins/debugger/cdb/cdbdebugengine.h 1 addition, 0 deletionssrc/plugins/debugger/cdb/cdbdebugengine.h
- src/plugins/debugger/cdb/cdbdebugeventcallback.cpp 1 addition, 3 deletionssrc/plugins/debugger/cdb/cdbdebugeventcallback.cpp
- src/plugins/debugger/debugger.pro 2 additions, 0 deletionssrc/plugins/debugger/debugger.pro
- src/plugins/debugger/debuggeractions.cpp 81 additions, 12 deletionssrc/plugins/debugger/debuggeractions.cpp
- src/plugins/debugger/debuggeractions.h 11 additions, 5 deletionssrc/plugins/debugger/debuggeractions.h
Loading
Please register or sign in to comment