Merge remote-tracking branch 'origin/2.6'
Conflicts: qtcreator.qbp src/plugins/qtsupport/baseqtversion.cpp src/tools/tools.pro Change-Id: I43c391328ae747b3dc566f9db2384fedc1a6d0a5
Showing
- README 3 additions, 3 deletionsREADME
- bin/bin.pro 1 addition, 1 deletionbin/bin.pro
- doc/api/coding-style.qdoc 3 additions, 3 deletionsdoc/api/coding-style.qdoc
- doc/doc.pri 2 additions, 2 deletionsdoc/doc.pri
- doc/src/debugger/creator-debugger-setup.qdoc 1 addition, 1 deletiondoc/src/debugger/creator-debugger-setup.qdoc
- doc/src/debugger/creator-debugger.qdoc 1 addition, 1 deletiondoc/src/debugger/creator-debugger.qdoc
- doc/src/editors/creator-editors.qdoc 1 addition, 1 deletiondoc/src/editors/creator-editors.qdoc
- doc/src/howto/creator-keyboard-shortcuts.qdoc 2 additions, 2 deletionsdoc/src/howto/creator-keyboard-shortcuts.qdoc
- doc/src/howto/creator-ui.qdoc 1 addition, 1 deletiondoc/src/howto/creator-ui.qdoc
- doc/src/howto/creator-vcs.qdoc 1 addition, 1 deletiondoc/src/howto/creator-vcs.qdoc
- doc/src/howto/qtcreator-faq.qdoc 1 addition, 1 deletiondoc/src/howto/qtcreator-faq.qdoc
- doc/src/projects/creator-projects-custom-wizards.qdoc 1 addition, 1 deletiondoc/src/projects/creator-projects-custom-wizards.qdoc
- lib/qtcreator/qtcomponents/custom/ButtonColumn.qml 1 addition, 1 deletionlib/qtcreator/qtcomponents/custom/ButtonColumn.qml
- lib/qtcreator/qtcomponents/custom/ButtonRow.qml 1 addition, 1 deletionlib/qtcreator/qtcomponents/custom/ButtonRow.qml
- lib/qtcreator/qtcomponents/custom/private/ChoiceListPopup.qml 1 addition, 1 deletion...qtcreator/qtcomponents/custom/private/ChoiceListPopup.qml
- lib/qtcreator/qtcomponents/qtcomponents.pro 1 addition, 1 deletionlib/qtcreator/qtcomponents/qtcomponents.pro
- qtcreator.pri 4 additions, 0 deletionsqtcreator.pri
- qtcreator.pro 10 additions, 6 deletionsqtcreator.pro
- qtcreator.qbp 3 additions, 1 deletionqtcreator.qbp
- scripts/bindistHelper.py 0 additions, 87 deletionsscripts/bindistHelper.py
Loading
Please register or sign in to comment