Merge remote-tracking branch 'origin/2.8' into HEAD
Conflicts: src/libs/cplusplus/FindUsages.cpp tests/auto/cplusplus/findusages/tst_findusages.cpp tests/auto/debugger/tst_dumpers.cpp Change-Id: I20e2002c7b25cc25d8120922fa9b52e59db498e3
No related branches found
No related tags found
Showing
- qbs/pluginspec/pluginspec.qbs 1 addition, 0 deletionsqbs/pluginspec/pluginspec.qbs
- share/qtcreator/dumper/lbridge.py 2 additions, 3 deletionsshare/qtcreator/dumper/lbridge.py
- share/qtcreator/dumper/qttypes.py 35 additions, 0 deletionsshare/qtcreator/dumper/qttypes.py
- src/app/app_version_header.qbs 1 addition, 0 deletionssrc/app/app_version_header.qbs
- src/libs/cplusplus/FindUsages.cpp 9 additions, 1 deletionsrc/libs/cplusplus/FindUsages.cpp
- src/plugins/qbsprojectmanager/qbsnodes.cpp 1 addition, 1 deletionsrc/plugins/qbsprojectmanager/qbsnodes.cpp
- src/plugins/qbsprojectmanager/qbsparser.h 1 addition, 1 deletionsrc/plugins/qbsprojectmanager/qbsparser.h
- src/plugins/qbsprojectmanager/qbsprojectmanager.h 1 addition, 1 deletionsrc/plugins/qbsprojectmanager/qbsprojectmanager.h
- src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp 2 additions, 2 deletionssrc/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
- src/shared/qbs 1 addition, 1 deletionsrc/shared/qbs
- tests/auto/cplusplus/findusages/tst_findusages.cpp 31 additions, 0 deletionstests/auto/cplusplus/findusages/tst_findusages.cpp
- tests/auto/debugger/tst_dumpers.cpp 82 additions, 29 deletionstests/auto/debugger/tst_dumpers.cpp
- tests/system/shared/utils.py 4 additions, 3 deletionstests/system/shared/utils.py
- tests/system/suite_HELP/tst_HELP04/test.py 2 additions, 2 deletionstests/system/suite_HELP/tst_HELP04/test.py
Loading
Please register or sign in to comment