Merge commit 'origin/master'
Showing
- share/qtcreator/gdbmacros/gdbmacros.cpp 63 additions, 53 deletionsshare/qtcreator/gdbmacros/gdbmacros.cpp
- src/libs/utils/pathchooser.cpp 1 addition, 1 deletionsrc/libs/utils/pathchooser.cpp
- src/plugins/debugger/gdbengine.cpp 14 additions, 4 deletionssrc/plugins/debugger/gdbengine.cpp
- src/plugins/resourceeditor/resourceeditorconstants.h 0 additions, 1 deletionsrc/plugins/resourceeditor/resourceeditorconstants.h
- src/plugins/resourceeditor/resourceeditorw.cpp 1 addition, 1 deletionsrc/plugins/resourceeditor/resourceeditorw.cpp
- src/shared/qrceditor/qrceditor.cpp 1 addition, 3 deletionssrc/shared/qrceditor/qrceditor.cpp
- src/shared/qrceditor/resourcefile.cpp 15 additions, 2 deletionssrc/shared/qrceditor/resourcefile.cpp
- src/shared/qrceditor/resourcefile_p.h 6 additions, 1 deletionsrc/shared/qrceditor/resourcefile_p.h
- src/tools/qtcreatorwidgets/qtcreatorwidgets.pro 8 additions, 2 deletionssrc/tools/qtcreatorwidgets/qtcreatorwidgets.pro
- tests/manual/gdbdebugger/simple/app.cpp 20 additions, 9 deletionstests/manual/gdbdebugger/simple/app.cpp
Loading
Please register or sign in to comment