Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Showing
- shared/proparser/profileevaluator.cpp 589 additions, 157 deletionsshared/proparser/profileevaluator.cpp
- shared/proparser/profileevaluator.h 5 additions, 1 deletionshared/proparser/profileevaluator.h
- shared/proparser/proitems.cpp 0 additions, 1 deletionshared/proparser/proitems.cpp
- shared/proparser/proitems.h 2 additions, 3 deletionsshared/proparser/proitems.h
- shared/proparser/proparserutils.h 31 additions, 9 deletionsshared/proparser/proparserutils.h
- src/plugins/coreplugin/generalsettings.cpp 1 addition, 3 deletionssrc/plugins/coreplugin/generalsettings.cpp
- src/plugins/cpptools/completionsettingspage.cpp 86 additions, 0 deletionssrc/plugins/cpptools/completionsettingspage.cpp
- src/plugins/cpptools/completionsettingspage.h 68 additions, 0 deletionssrc/plugins/cpptools/completionsettingspage.h
- src/plugins/cpptools/completionsettingspage.ui 54 additions, 0 deletionssrc/plugins/cpptools/completionsettingspage.ui
- src/plugins/cpptools/cppcodecompletion.cpp 40 additions, 19 deletionssrc/plugins/cpptools/cppcodecompletion.cpp
- src/plugins/cpptools/cppcodecompletion.h 8 additions, 0 deletionssrc/plugins/cpptools/cppcodecompletion.h
- src/plugins/cpptools/cpptools.pro 7 additions, 4 deletionssrc/plugins/cpptools/cpptools.pro
- src/plugins/cpptools/cpptoolsplugin.cpp 35 additions, 4 deletionssrc/plugins/cpptools/cpptoolsplugin.cpp
- src/plugins/cpptools/cpptoolsplugin.h 2 additions, 0 deletionssrc/plugins/cpptools/cpptoolsplugin.h
- src/plugins/projectexplorer/projectexplorer.cpp 6 additions, 3 deletionssrc/plugins/projectexplorer/projectexplorer.cpp
- src/plugins/projectexplorer/projectexplorer.h 1 addition, 1 deletionsrc/plugins/projectexplorer/projectexplorer.h
- src/plugins/quickopen/settingspage.cpp 0 additions, 2 deletionssrc/plugins/quickopen/settingspage.cpp
- tests/auto/cplusplus/ast/ast.pro 5 additions, 0 deletionstests/auto/cplusplus/ast/ast.pro
- tests/auto/cplusplus/ast/tst_ast.cpp 73 additions, 0 deletionstests/auto/cplusplus/ast/tst_ast.cpp
- tests/auto/cplusplus/cplusplus.pro 3 additions, 0 deletionstests/auto/cplusplus/cplusplus.pro
Loading
Please register or sign in to comment