Merge remote-tracking branch 'origin/4.0'
Conflicts: qtcreator.pri qtcreator.qbs src/plugins/debugger/debuggerruncontrol.cpp Change-Id: I81b43480a1369e3d7be60ae26e812dda6b962b0b
No related branches found
No related tags found
Showing
- doc/images/qtcreator-cmake-build-settings.png 0 additions, 0 deletionsdoc/images/qtcreator-cmake-build-settings.png
- doc/images/qtcreator-cmake-build-steps.png 0 additions, 0 deletionsdoc/images/qtcreator-cmake-build-steps.png
- doc/images/qtcreator-cmake-clean-steps.png 0 additions, 0 deletionsdoc/images/qtcreator-cmake-clean-steps.png
- doc/images/qtcreator-cmake-import-wizard1.png 0 additions, 0 deletionsdoc/images/qtcreator-cmake-import-wizard1.png
- doc/images/qtcreator-cmake-import-wizard2.png 0 additions, 0 deletionsdoc/images/qtcreator-cmake-import-wizard2.png
- doc/images/qtcreator-cmake-run-cmake.png 0 additions, 0 deletionsdoc/images/qtcreator-cmake-run-cmake.png
- doc/images/qtcreator-cmake-run-settings.png 0 additions, 0 deletionsdoc/images/qtcreator-cmake-run-settings.png
- doc/images/qtcreator-cmakeexecutable.png 0 additions, 0 deletionsdoc/images/qtcreator-cmakeexecutable.png
- doc/images/qtcreator-kits.png 0 additions, 0 deletionsdoc/images/qtcreator-kits.png
- doc/src/overview/creator-issues.qdoc 0 additions, 2 deletionsdoc/src/overview/creator-issues.qdoc
- doc/src/projects/creator-projects-cmake.qdoc 106 additions, 45 deletionsdoc/src/projects/creator-projects-cmake.qdoc
- doc/src/projects/creator-projects-targets.qdoc 10 additions, 0 deletionsdoc/src/projects/creator-projects-targets.qdoc
- share/qtcreator/debugger/qttypes.py 1 addition, 1 deletionshare/qtcreator/debugger/qttypes.py
- share/qtcreator/translations/qtcreator_ru.ts 2827 additions, 1381 deletionsshare/qtcreator/translations/qtcreator_ru.ts
- src/libs/qmljs/qmljsinterpreter.cpp 8 additions, 0 deletionssrc/libs/qmljs/qmljsinterpreter.cpp
- src/libs/qmljs/qmljsinterpreter.h 1 addition, 0 deletionssrc/libs/qmljs/qmljsinterpreter.h
- src/libs/qmljs/qmljslink.cpp 15 additions, 8 deletionssrc/libs/qmljs/qmljslink.cpp
- src/libs/qmljs/qmljsmodelmanagerinterface.cpp 36 additions, 37 deletionssrc/libs/qmljs/qmljsmodelmanagerinterface.cpp
- src/libs/qmljs/qmljsmodelmanagerinterface.h 6 additions, 0 deletionssrc/libs/qmljs/qmljsmodelmanagerinterface.h
- src/libs/qmljs/qmljsqrcparser.cpp 39 additions, 7 deletionssrc/libs/qmljs/qmljsqrcparser.cpp
Loading
Please register or sign in to comment