Merge remote-tracking branch 'origin/2.6'
Showing
- doc/images/qtcreator-build-steps-custom.png 0 additions, 0 deletionsdoc/images/qtcreator-build-steps-custom.png
- doc/images/qtcreator-build-steps.png 0 additions, 0 deletionsdoc/images/qtcreator-build-steps.png
- doc/images/qtcreator-clean-steps.png 0 additions, 0 deletionsdoc/images/qtcreator-clean-steps.png
- doc/images/qtcreator-disable-steps.png 0 additions, 0 deletionsdoc/images/qtcreator-disable-steps.png
- doc/images/qtcreator-project-targets.png 0 additions, 0 deletionsdoc/images/qtcreator-project-targets.png
- doc/src/projects/creator-projects-settings-code-style.qdoc 1 addition, 1 deletiondoc/src/projects/creator-projects-settings-code-style.qdoc
- doc/src/projects/creator-projects-settings-overview.qdoc 7 additions, 12 deletionsdoc/src/projects/creator-projects-settings-overview.qdoc
- doc/src/qtquick/qtquick-components.qdoc 0 additions, 4 deletionsdoc/src/qtquick/qtquick-components.qdoc
- src/libs/3rdparty/botan/botan.pro 2 additions, 2 deletionssrc/libs/3rdparty/botan/botan.pro
- src/libs/3rdparty/cplusplus/Lexer.cpp 13 additions, 19 deletionssrc/libs/3rdparty/cplusplus/Lexer.cpp
- src/libs/3rdparty/cplusplus/Lexer.h 1 addition, 1 deletionsrc/libs/3rdparty/cplusplus/Lexer.h
- src/libs/utils/savefile.cpp 1 addition, 1 deletionsrc/libs/utils/savefile.cpp
- src/libs/utils/tcpportsgatherer.cpp 1 addition, 1 deletionsrc/libs/utils/tcpportsgatherer.cpp
- src/plugins/debugger/debuggerprofileinformation.cpp 21 additions, 6 deletionssrc/plugins/debugger/debuggerprofileinformation.cpp
- src/plugins/resourceeditor/qrceditor/resourcefile.cpp 5 additions, 15 deletionssrc/plugins/resourceeditor/qrceditor/resourcefile.cpp
- src/plugins/resourceeditor/qrceditor/resourcefile_p.h 2 additions, 0 deletionssrc/plugins/resourceeditor/qrceditor/resourcefile_p.h
Loading
Please register or sign in to comment