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 56 additions, 41 deletionsdoc/qtcreator.qdoc
- doc/qtcreator.qdocconf 1 addition, 0 deletionsdoc/qtcreator.qdocconf
- share/qtcreator/gdbmacros/gdbmacros.cpp 3 additions, 3 deletionsshare/qtcreator/gdbmacros/gdbmacros.cpp
- src/libs/cplusplus/ExpressionUnderCursor.cpp 44 additions, 7 deletionssrc/libs/cplusplus/ExpressionUnderCursor.cpp
- src/libs/cplusplus/ExpressionUnderCursor.h 6 additions, 0 deletionssrc/libs/cplusplus/ExpressionUnderCursor.h
- src/libs/cplusplus/LookupContext.cpp 8 additions, 3 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 2 additions, 4 deletionssrc/libs/utils/submiteditorwidget.cpp
- src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp 78 additions, 0 deletionssrc/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
- src/plugins/cmakeprojectmanager/cmakeprojectmanager.h 5 additions, 0 deletionssrc/plugins/cmakeprojectmanager/cmakeprojectmanager.h
- src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp 24 additions, 4 deletionssrc/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
- src/plugins/cmakeprojectmanager/cmakerunconfiguration.h 6 additions, 0 deletionssrc/plugins/cmakeprojectmanager/cmakerunconfiguration.h
- src/plugins/cppeditor/CppEditor.mimetypes.xml 1 addition, 0 deletionssrc/plugins/cppeditor/CppEditor.mimetypes.xml
- 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
Loading
Please register or sign in to comment