Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta
Showing
- .gitignore 3 additions, 23 deletions.gitignore
- shared/cplusplus/Parser.cpp 10 additions, 2 deletionsshared/cplusplus/Parser.cpp
- shared/cplusplus/Scope.cpp 2 additions, 0 deletionsshared/cplusplus/Scope.cpp
- shared/help/help.pri 3 additions, 2 deletionsshared/help/help.pri
- src/libs/cplusplus/CppDocument.cpp 5 additions, 0 deletionssrc/libs/cplusplus/CppDocument.cpp
- src/libs/cplusplus/CppDocument.h 6 additions, 0 deletionssrc/libs/cplusplus/CppDocument.h
- src/libs/cplusplus/ResolveExpression.cpp 2 additions, 2 deletionssrc/libs/cplusplus/ResolveExpression.cpp
- src/libs/cplusplus/TypeOfExpression.cpp 2 additions, 1 deletionsrc/libs/cplusplus/TypeOfExpression.cpp
- src/libs/utils/filesearch.cpp 1 addition, 1 deletionsrc/libs/utils/filesearch.cpp
- src/libs/utils/filewizarddialog.cpp 2 additions, 0 deletionssrc/libs/utils/filewizarddialog.cpp
- src/libs/utils/synchronousprocess.cpp 32 additions, 18 deletionssrc/libs/utils/synchronousprocess.cpp
- src/plugins/cmakeprojectmanager/cmakeprojectconstants.h 1 addition, 0 deletionssrc/plugins/cmakeprojectmanager/cmakeprojectconstants.h
- src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro 4 additions, 2 deletionssrc/plugins/cmakeprojectmanager/cmakeprojectmanager.pro
- src/plugins/cmakeprojectmanager/cmakestep.cpp 41 additions, 5 deletionssrc/plugins/cmakeprojectmanager/cmakestep.cpp
- src/plugins/cmakeprojectmanager/cmakestep.h 35 additions, 1 deletionsrc/plugins/cmakeprojectmanager/cmakestep.h
- src/plugins/cmakeprojectmanager/makestep.cpp 127 additions, 0 deletionssrc/plugins/cmakeprojectmanager/makestep.cpp
- src/plugins/cmakeprojectmanager/makestep.h 79 additions, 0 deletionssrc/plugins/cmakeprojectmanager/makestep.h
- src/plugins/coreplugin/basefilewizard.cpp 2 additions, 0 deletionssrc/plugins/coreplugin/basefilewizard.cpp
- src/plugins/coreplugin/coreconstants.h 1 addition, 0 deletionssrc/plugins/coreplugin/coreconstants.h
- src/plugins/coreplugin/editormanager/editormanager.cpp 32 additions, 29 deletionssrc/plugins/coreplugin/editormanager/editormanager.cpp
Loading
Please register or sign in to comment