Merge branch '1.0.0'
Conflicts: tests/auto/cplusplus/shared/shared.pri tests/auto/cplusplus/shared/shared.pro
Showing
- src/libs/cplusplus/TypePrettyPrinter.cpp 2 additions, 0 deletionssrc/libs/cplusplus/TypePrettyPrinter.cpp
- src/plugins/coreplugin/html/images/feedback-text.png 0 additions, 0 deletionssrc/plugins/coreplugin/html/images/feedback-text.png
- src/plugins/cppeditor/cpphoverhandler.cpp 4 additions, 3 deletionssrc/plugins/cppeditor/cpphoverhandler.cpp
- src/plugins/debugger/breakbyfunction.ui 1 addition, 1 deletionsrc/plugins/debugger/breakbyfunction.ui
- src/plugins/debugger/gdbengine.cpp 1 addition, 1 deletionsrc/plugins/debugger/gdbengine.cpp
- src/plugins/qt4projectmanager/gccparser.cpp 14 additions, 33 deletionssrc/plugins/qt4projectmanager/gccparser.cpp
- src/plugins/qt4projectmanager/gccparser.h 0 additions, 1 deletionsrc/plugins/qt4projectmanager/gccparser.h
- src/plugins/qt4projectmanager/qt4nodes.cpp 4 additions, 4 deletionssrc/plugins/qt4projectmanager/qt4nodes.cpp
- src/plugins/qt4projectmanager/qt4nodes.h 1 addition, 1 deletionsrc/plugins/qt4projectmanager/qt4nodes.h
- src/plugins/qt4projectmanager/qtversionmanager.cpp 1 addition, 0 deletionssrc/plugins/qt4projectmanager/qtversionmanager.cpp
- src/plugins/texteditor/basetexteditor.cpp 3 additions, 2 deletionssrc/plugins/texteditor/basetexteditor.cpp
- src/shared/qtsingleapplication/qtlocalpeer.cpp 1 addition, 1 deletionsrc/shared/qtsingleapplication/qtlocalpeer.cpp
- src/tools/qtlibspatcher/qtlibspatchermain.cpp 17 additions, 4 deletionssrc/tools/qtlibspatcher/qtlibspatchermain.cpp
- tests/auto/cplusplus/ast/ast.pro 3 additions, 2 deletionstests/auto/cplusplus/ast/ast.pro
- tests/auto/cplusplus/semantic/semantic.pro 3 additions, 2 deletionstests/auto/cplusplus/semantic/semantic.pro
Loading
Please register or sign in to comment