Merge remote-tracking branch 'origin/2.5'
Showing
- doc/images/qt-simulator.png 0 additions, 0 deletionsdoc/images/qt-simulator.png
- doc/images/qtcreator-gs-build-example-open.png 0 additions, 0 deletionsdoc/images/qtcreator-gs-build-example-open.png
- doc/images/qtcreator-gs-build-example-select-qs.png 0 additions, 0 deletionsdoc/images/qtcreator-gs-build-example-select-qs.png
- doc/images/qtcreator-gs-build-example-targets.png 0 additions, 0 deletionsdoc/images/qtcreator-gs-build-example-targets.png
- doc/src/overview/creator-getting-started.qdoc 2 additions, 2 deletionsdoc/src/overview/creator-getting-started.qdoc
- doc/src/projects/creator-projects-autotools.qdoc 3 additions, 1 deletiondoc/src/projects/creator-projects-autotools.qdoc
- doc/src/projects/creator-projects-build-run-tutorial.qdoc 23 additions, 18 deletionsdoc/src/projects/creator-projects-build-run-tutorial.qdoc
- doc/src/qtcreator.qdoc 2 additions, 2 deletionsdoc/src/qtcreator.qdoc
- src/plugins/bookmarks/bookmark.cpp 1 addition, 1 deletionsrc/plugins/bookmarks/bookmark.cpp
- src/plugins/cmakeprojectmanager/cmakeproject.cpp 2 additions, 2 deletionssrc/plugins/cmakeprojectmanager/cmakeproject.cpp
- src/plugins/coreplugin/dialogs/externaltoolconfig.cpp 50 additions, 24 deletionssrc/plugins/coreplugin/dialogs/externaltoolconfig.cpp
- src/plugins/coreplugin/dialogs/externaltoolconfig.h 2 additions, 0 deletionssrc/plugins/coreplugin/dialogs/externaltoolconfig.h
- src/plugins/debugger/gdb/gdbengine.cpp 1 addition, 1 deletionsrc/plugins/debugger/gdb/gdbengine.cpp
- src/plugins/debugger/qml/qmldebuggerclient.h 2 additions, 1 deletionsrc/plugins/debugger/qml/qmldebuggerclient.h
- src/plugins/debugger/qml/qmlengine.cpp 237 additions, 3 deletionssrc/plugins/debugger/qml/qmlengine.cpp
- src/plugins/debugger/qml/qmlengine.h 4 additions, 0 deletionssrc/plugins/debugger/qml/qmlengine.h
- src/plugins/debugger/qml/qmlv8debuggerclient.cpp 44 additions, 38 deletionssrc/plugins/debugger/qml/qmlv8debuggerclient.cpp
- src/plugins/debugger/qml/qmlv8debuggerclient.h 2 additions, 1 deletionsrc/plugins/debugger/qml/qmlv8debuggerclient.h
- src/plugins/debugger/qml/qscriptdebuggerclient.cpp 16 additions, 25 deletionssrc/plugins/debugger/qml/qscriptdebuggerclient.cpp
- src/plugins/debugger/qml/qscriptdebuggerclient.h 2 additions, 1 deletionsrc/plugins/debugger/qml/qscriptdebuggerclient.h
Loading
Please register or sign in to comment