Merge branch '2.1' of scm.dev.nokia.troll.no:creator/mainline
No related branches found
No related tags found
Showing
- share/qtcreator/qmljsdebugger/jsdebuggeragent.cpp 0 additions, 1 deletionshare/qtcreator/qmljsdebugger/jsdebuggeragent.cpp
- share/qtcreator/templates/wizards/qml-extension/object.cpp 7 additions, 24 deletionsshare/qtcreator/templates/wizards/qml-extension/object.cpp
- share/qtcreator/templates/wizards/qml-extension/object.h 7 additions, 22 deletionsshare/qtcreator/templates/wizards/qml-extension/object.h
- share/qtcreator/templates/wizards/qml-extension/plugin.cpp 3 additions, 3 deletionsshare/qtcreator/templates/wizards/qml-extension/plugin.cpp
- share/qtcreator/templates/wizards/qml-extension/plugin.h 4 additions, 4 deletionsshare/qtcreator/templates/wizards/qml-extension/plugin.h
- share/qtcreator/templates/wizards/qml-extension/project.pro 11 additions, 5 deletionsshare/qtcreator/templates/wizards/qml-extension/project.pro
- share/qtcreator/templates/wizards/qml-extension/wizard.xml 9 additions, 4 deletionsshare/qtcreator/templates/wizards/qml-extension/wizard.xml
- share/qtcreator/translations/qtcreator_de.ts 1 addition, 1 deletionshare/qtcreator/translations/qtcreator_de.ts
- src/libs/qmleditorwidgets/contextpanewidgetimage.cpp 4 additions, 4 deletionssrc/libs/qmleditorwidgets/contextpanewidgetimage.cpp
- src/plugins/debugger/breakbyfunction.ui 0 additions, 58 deletionssrc/plugins/debugger/breakbyfunction.ui
- src/plugins/debugger/breakhandler.cpp 12 additions, 0 deletionssrc/plugins/debugger/breakhandler.cpp
- src/plugins/debugger/breakhandler.h 2 additions, 1 deletionsrc/plugins/debugger/breakhandler.h
- src/plugins/debugger/breakpoint.cpp 6 additions, 0 deletionssrc/plugins/debugger/breakpoint.cpp
- src/plugins/debugger/breakpoint.h 1 addition, 0 deletionssrc/plugins/debugger/breakpoint.h
- src/plugins/debugger/breakpoint.ui 32 additions, 18 deletionssrc/plugins/debugger/breakpoint.ui
- src/plugins/debugger/breakwindow.cpp 54 additions, 53 deletionssrc/plugins/debugger/breakwindow.cpp
- src/plugins/debugger/breakwindow.h 1 addition, 0 deletionssrc/plugins/debugger/breakwindow.h
- src/plugins/debugger/debugger.pro 0 additions, 1 deletionsrc/plugins/debugger/debugger.pro
- src/plugins/debugger/debuggeractions.cpp 0 additions, 3 deletionssrc/plugins/debugger/debuggeractions.cpp
- src/plugins/debugger/debuggeractions.h 0 additions, 1 deletionsrc/plugins/debugger/debuggeractions.h
Loading
Please register or sign in to comment