Merge commit 'origin/0.9.1-beta'
Conflicts: doc/qtcreator.qdoc src/plugins/qt4projectmanager/qtversionmanager.cpp
Showing
- bin/gdbmacros/gdbmacros.cpp 15 additions, 4 deletionsbin/gdbmacros/gdbmacros.cpp
- doc/qtcreator.qch 0 additions, 0 deletionsdoc/qtcreator.qch
- doc/qtcreator.qdoc 55 additions, 52 deletionsdoc/qtcreator.qdoc
- shared/help/bookmarkmanager.h 9 additions, 7 deletionsshared/help/bookmarkmanager.h
- src/app/main.cpp 2 additions, 2 deletionssrc/app/main.cpp
- src/libs/cplusplus/CppDocument.cpp 2 additions, 17 deletionssrc/libs/cplusplus/CppDocument.cpp
- src/libs/cplusplus/CppDocument.h 9 additions, 6 deletionssrc/libs/cplusplus/CppDocument.h
- src/libs/cplusplus/Icons.cpp 2 additions, 2 deletionssrc/libs/cplusplus/Icons.cpp
- src/libs/cplusplus/Icons.h 1 addition, 1 deletionsrc/libs/cplusplus/Icons.h
- src/libs/cplusplus/OverviewModel.cpp 36 additions, 10 deletionssrc/libs/cplusplus/OverviewModel.cpp
- src/libs/cplusplus/TypeOfExpression.cpp 1 addition, 0 deletionssrc/libs/cplusplus/TypeOfExpression.cpp
- src/libs/cplusplus/TypeOfExpression.h 3 additions, 0 deletionssrc/libs/cplusplus/TypeOfExpression.h
- src/libs/cplusplus/cplusplus.pro 14 additions, 2 deletionssrc/libs/cplusplus/cplusplus.pro
- src/libs/cplusplus/pp-cctype.h 8 additions, 6 deletionssrc/libs/cplusplus/pp-cctype.h
- src/libs/cplusplus/pp-client.h 6 additions, 4 deletionssrc/libs/cplusplus/pp-client.h
- src/libs/cplusplus/pp-engine.cpp 5 additions, 17 deletionssrc/libs/cplusplus/pp-engine.cpp
- src/libs/cplusplus/pp-engine.h 4 additions, 4 deletionssrc/libs/cplusplus/pp-engine.h
- src/libs/cplusplus/pp-environment.cpp 3 additions, 3 deletionssrc/libs/cplusplus/pp-environment.cpp
- src/libs/cplusplus/pp-environment.h 7 additions, 5 deletionssrc/libs/cplusplus/pp-environment.h
- src/libs/cplusplus/pp-fwd.h 0 additions, 0 deletionssrc/libs/cplusplus/pp-fwd.h
Loading
Please register or sign in to comment