Merge remote branch 'origin/2.1'
Conflicts: doc/qtcreator.qdoc
No related branches found
No related tags found
Showing
- doc/images/qml-states-example.png 0 additions, 0 deletionsdoc/images/qml-states-example.png
- doc/images/qmldesigner-transparent-button.png 0 additions, 0 deletionsdoc/images/qmldesigner-transparent-button.png
- doc/images/qmldesigner-tutorial-desing-mode.png 0 additions, 0 deletionsdoc/images/qmldesigner-tutorial-desing-mode.png
- doc/images/qmldesigner-tutorial-page.png 0 additions, 0 deletionsdoc/images/qmldesigner-tutorial-page.png
- doc/images/qmldesigner-tutorial-project.png 0 additions, 0 deletionsdoc/images/qmldesigner-tutorial-project.png
- doc/images/qmldesigner-tutorial-quick-toolbar.png 0 additions, 0 deletionsdoc/images/qmldesigner-tutorial-quick-toolbar.png
- doc/images/qmldesigner-tutorial-state1.png 0 additions, 0 deletionsdoc/images/qmldesigner-tutorial-state1.png
- doc/images/qmldesigner-tutorial-topleftrect-layout.png 0 additions, 0 deletionsdoc/images/qmldesigner-tutorial-topleftrect-layout.png
- doc/images/qmldesigner-tutorial-topleftrect.png 0 additions, 0 deletionsdoc/images/qmldesigner-tutorial-topleftrect.png
- doc/images/qmldesigner-tutorial-user-icon.png 0 additions, 0 deletionsdoc/images/qmldesigner-tutorial-user-icon.png
- doc/images/qmldesigner-tutorial.png 0 additions, 0 deletionsdoc/images/qmldesigner-tutorial.png
- doc/images/qtcreator-breakdown.png 0 additions, 0 deletionsdoc/images/qtcreator-breakdown.png
- doc/qtcreator.qdoc 265 additions, 59 deletionsdoc/qtcreator.qdoc
- share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml 2 additions, 1 deletionshare/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml
- share/qtcreator/rss/featured.rss 5 additions, 5 deletionsshare/qtcreator/rss/featured.rss
- share/qtcreator/rss/images/qtcreator-textfinder-screenshot.png 0 additions, 0 deletions.../qtcreator/rss/images/qtcreator-textfinder-screenshot.png
- share/qtcreator/rss/images/qtquick.png 0 additions, 0 deletionsshare/qtcreator/rss/images/qtquick.png
- share/qtcreator/translations/qtcreator_de.ts 3 additions, 2 deletionsshare/qtcreator/translations/qtcreator_de.ts
- share/qtcreator/translations/qtcreator_fr.ts 3 additions, 2 deletionsshare/qtcreator/translations/qtcreator_fr.ts
- share/qtcreator/translations/qtcreator_ja.ts 3 additions, 2 deletionsshare/qtcreator/translations/qtcreator_ja.ts
Loading
Please register or sign in to comment