Merge remote-tracking branch 'origin/3.4'
Change-Id: Id13cbdf2f7047366e543c91fbe7c21a9c4759e56
Showing
- qtcreator.pro 7 additions, 0 deletionsqtcreator.pro
- qtcreator.qbs 2 additions, 0 deletionsqtcreator.qbs
- scripts/deployqt.py 1 addition, 1 deletionscripts/deployqt.py
- share/qtcreator/translations/qtcreator_fr.ts 1 addition, 1 deletionshare/qtcreator/translations/qtcreator_fr.ts
- src/plugins/cmakeprojectmanager/generatorinfo.cpp 6 additions, 3 deletionssrc/plugins/cmakeprojectmanager/generatorinfo.cpp
- src/plugins/debugger/cdb/cdbengine.cpp 2 additions, 0 deletionssrc/plugins/debugger/cdb/cdbengine.cpp
- src/plugins/projectexplorer/abi.cpp 9 additions, 2 deletionssrc/plugins/projectexplorer/abi.cpp
- src/plugins/projectexplorer/abi.h 1 addition, 0 deletionssrc/plugins/projectexplorer/abi.h
- src/plugins/projectexplorer/abstractmsvctoolchain.cpp 2 additions, 1 deletionsrc/plugins/projectexplorer/abstractmsvctoolchain.cpp
- src/plugins/projectexplorer/msvctoolchain.cpp 11 additions, 1 deletionsrc/plugins/projectexplorer/msvctoolchain.cpp
- src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp 2 additions, 1 deletionsrc/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
- src/plugins/qbsprojectmanager/qbsprojectparser.cpp 9 additions, 0 deletionssrc/plugins/qbsprojectmanager/qbsprojectparser.cpp
- src/plugins/qbsprojectmanager/qbsprojectparser.h 1 addition, 0 deletionssrc/plugins/qbsprojectmanager/qbsprojectparser.h
- src/plugins/valgrind/callgrind/callgrindcallmodel.cpp 2 additions, 3 deletionssrc/plugins/valgrind/callgrind/callgrindcallmodel.cpp
- src/plugins/valgrind/callgrind/callgrinddatamodel.cpp 2 additions, 3 deletionssrc/plugins/valgrind/callgrind/callgrinddatamodel.cpp
- src/shared/qbs 1 addition, 1 deletionsrc/shared/qbs
- src/src.pro 3 additions, 0 deletionssrc/src.pro
- src/src.qbs 4 additions, 0 deletionssrc/src.qbs
- src/tools/sdktool/addtoolchainoperation.cpp 2 additions, 0 deletionssrc/tools/sdktool/addtoolchainoperation.cpp
- tests/system/shared/classes.py 2 additions, 9 deletionstests/system/shared/classes.py
Loading
Please register or sign in to comment