Merge remote-tracking branch 'origin/2.5'
Conflicts: qtcreator.pri Change-Id: Ic24b756b41d2a13f3d696dee69553d2c3241ab95
Showing
- dist/changes-2.5.0 47 additions, 1 deletiondist/changes-2.5.0
- doc/config/qt-html-templates-online.qdocconf 14 additions, 11 deletionsdoc/config/qt-html-templates-online.qdocconf
- doc/config/qt-html-templates.qdocconf 18 additions, 16 deletionsdoc/config/qt-html-templates.qdocconf
- doc/images/qtcreator-ssh-key-configuration.png 0 additions, 0 deletionsdoc/images/qtcreator-ssh-key-configuration.png
- doc/src/linux-mobile/linuxdev-keys.qdocinc 6 additions, 7 deletionsdoc/src/linux-mobile/linuxdev-keys.qdocinc
- scripts/deployqt.py 25 additions, 28 deletionsscripts/deployqt.py
- share/qtcreator/translations/qtcreator_de.ts 1 addition, 1 deletionshare/qtcreator/translations/qtcreator_de.ts
- share/qtcreator/welcomescreen/develop.qml 5 additions, 3 deletionsshare/qtcreator/welcomescreen/develop.qml
- share/qtcreator/welcomescreen/widgets/RecentProjects.qml 2 additions, 1 deletionshare/qtcreator/welcomescreen/widgets/RecentProjects.qml
- share/qtcreator/welcomescreen/widgets/Sessions.qml 2 additions, 0 deletionsshare/qtcreator/welcomescreen/widgets/Sessions.qml
- share/qtcreator/welcomescreen/widgets/images/icons/delete.png 0 additions, 0 deletions...e/qtcreator/welcomescreen/widgets/images/icons/delete.png
- share/qtcreator/welcomescreen/widgets/images/icons/rename.png 0 additions, 0 deletions...e/qtcreator/welcomescreen/widgets/images/icons/rename.png
- share/qtcreator/welcomescreen/widgets/images/info.png 0 additions, 0 deletionsshare/qtcreator/welcomescreen/widgets/images/info.png
- src/libs/cplusplus/CppDocument.cpp 2 additions, 2 deletionssrc/libs/cplusplus/CppDocument.cpp
- src/libs/qmljs/qmljsinterpreter.cpp 1 addition, 1 deletionsrc/libs/qmljs/qmljsinterpreter.cpp
- src/libs/qmljs/qmljstypedescriptionreader.cpp 1 addition, 1 deletionsrc/libs/qmljs/qmljstypedescriptionreader.cpp
- src/plugins/bineditor/bineditor.cpp 24 additions, 12 deletionssrc/plugins/bineditor/bineditor.cpp
- src/plugins/bineditor/bineditorplugin.cpp 2 additions, 2 deletionssrc/plugins/bineditor/bineditorplugin.cpp
- src/plugins/cpaster/cpasterplugin.cpp 1 addition, 1 deletionsrc/plugins/cpaster/cpasterplugin.cpp
- src/plugins/cppeditor/cppeditor.cpp 32 additions, 9 deletionssrc/plugins/cppeditor/cppeditor.cpp
Loading
Please register or sign in to comment