Merge remote-tracking branch 'origin/2.4'
Conflicts: qtcreator.pri src/libs/qmljs/qmljscheck.cpp src/plugins/debugger/gdb/gdbengine.cpp src/plugins/debugger/gdb/remotegdbserveradapter.cpp src/plugins/plugins.pro src/plugins/projectexplorer/buildmanager.cpp src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp Change-Id: Id2dcebf95b94dc46c1d85908ba1d1378aaf362ac
No related branches found
No related tags found
Showing
- LICENSE.PREVIEW.COMMERCIAL 0 additions, 629 deletionsLICENSE.PREVIEW.COMMERCIAL
- dist/changes-2.4.0 36 additions, 0 deletionsdist/changes-2.4.0
- doc/api/coding-style.qdoc 16 additions, 22 deletionsdoc/api/coding-style.qdoc
- doc/api/qtcreator-dev.qdoc 2 additions, 2 deletionsdoc/api/qtcreator-dev.qdoc
- doc/images/qmldesigner-breadcrumbs.png 0 additions, 0 deletionsdoc/images/qmldesigner-breadcrumbs.png
- doc/images/qmldesigner-tutorial-desing-mode.png 0 additions, 0 deletionsdoc/images/qmldesigner-tutorial-desing-mode.png
- doc/images/qtcreator-add-resource.png 0 additions, 0 deletionsdoc/images/qtcreator-add-resource.png
- doc/images/qtcreator-breakdown.png 0 additions, 0 deletionsdoc/images/qtcreator-breakdown.png
- doc/images/qtcreator-cmake-build-settings.png 0 additions, 0 deletionsdoc/images/qtcreator-cmake-build-settings.png
- doc/images/qtcreator-cmakeexecutable.png 0 additions, 0 deletionsdoc/images/qtcreator-cmakeexecutable.png
- doc/images/qtcreator-context-sensitive-help.png 0 additions, 0 deletionsdoc/images/qtcreator-context-sensitive-help.png
- doc/images/qtcreator-edit-mode.png 0 additions, 0 deletionsdoc/images/qtcreator-edit-mode.png
- doc/images/qtcreator-external-tools.png 0 additions, 0 deletionsdoc/images/qtcreator-external-tools.png
- doc/images/qtcreator-formedit.png 0 additions, 0 deletionsdoc/images/qtcreator-formedit.png
- doc/images/qtcreator-generic-highlighter.png 0 additions, 0 deletionsdoc/images/qtcreator-generic-highlighter.png
- doc/images/qtcreator-help-filters.png 0 additions, 0 deletionsdoc/images/qtcreator-help-filters.png
- doc/images/qtcreator-help-search.png 0 additions, 0 deletionsdoc/images/qtcreator-help-search.png
- doc/images/qtcreator-linux-device-configurations.png 0 additions, 0 deletionsdoc/images/qtcreator-linux-device-configurations.png
- doc/images/qtcreator-locator-classes.png 0 additions, 0 deletionsdoc/images/qtcreator-locator-classes.png
- doc/images/qtcreator-locator-current-project.png 0 additions, 0 deletionsdoc/images/qtcreator-locator-current-project.png
Loading
Please register or sign in to comment