diff options
| author | Bea Lam <bea.lam@nokia.com> | 2012-05-24 15:34:59 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-24 09:40:21 +0200 |
| commit | 09e624fa6b00855f5daa682fe8b9444e0e170d7f (patch) | |
| tree | 305cfdc870f5ff31307de3843cc1343fd89f0c0a /src/qml/doc | |
| parent | d6242b7d37066204f1aa14b17de72b2f7fd65d41 (diff) | |
Remove duplicated doc files and images
- Remove doc/ files which were duplicated under src/quick/doc and
src/qml/doc
- Remove duplicated images under src/doc/qml/images which were already
under src/doc/quick/images
- Merged 0102413396c91e97ed856235cd1a52f7185c4862 and
3b04bbde6356797368114fce1b45b85271e9fed8 which made it into doc/src
but not src/qml/doc
Change-Id: I275b7d29f9fc2222dcf801c257c1f67b5880446b
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'src/qml/doc')
153 files changed, 237 insertions, 1 deletions
diff --git a/src/qml/doc/images/3d-rotation-axis.png b/src/qml/doc/images/3d-rotation-axis.png Binary files differdeleted file mode 100644 index b9402156f0..0000000000 --- a/src/qml/doc/images/3d-rotation-axis.png +++ /dev/null diff --git a/src/qml/doc/images/ListViewHorizontal.png b/src/qml/doc/images/ListViewHorizontal.png Binary files differdeleted file mode 100644 index 4633a0e151..0000000000 --- a/src/qml/doc/images/ListViewHorizontal.png +++ /dev/null diff --git a/src/qml/doc/images/anchorchanges.png b/src/qml/doc/images/anchorchanges.png Binary files differdeleted file mode 100644 index 4973e4e9aa..0000000000 --- a/src/qml/doc/images/anchorchanges.png +++ /dev/null diff --git a/src/qml/doc/images/animatedimageitem.gif b/src/qml/doc/images/animatedimageitem.gif Binary files differdeleted file mode 100644 index 85c3cb5609..0000000000 --- a/src/qml/doc/images/animatedimageitem.gif +++ /dev/null diff --git a/src/qml/doc/images/axisrotation.png b/src/qml/doc/images/axisrotation.png Binary files differdeleted file mode 100644 index 4cddcdfcaf..0000000000 --- a/src/qml/doc/images/axisrotation.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-anchors_example.png b/src/qml/doc/images/declarative-anchors_example.png Binary files differdeleted file mode 100644 index 293cd4b362..0000000000 --- a/src/qml/doc/images/declarative-anchors_example.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-anchors_example2.png b/src/qml/doc/images/declarative-anchors_example2.png Binary files differdeleted file mode 100644 index 6d3be7d05d..0000000000 --- a/src/qml/doc/images/declarative-anchors_example2.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-arcdirection.png b/src/qml/doc/images/declarative-arcdirection.png Binary files differdeleted file mode 100644 index 28f4dc2e51..0000000000 --- a/src/qml/doc/images/declarative-arcdirection.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-arcradius.png b/src/qml/doc/images/declarative-arcradius.png Binary files differdeleted file mode 100644 index 9b25a9f3f8..0000000000 --- a/src/qml/doc/images/declarative-arcradius.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-gridmesh.png b/src/qml/doc/images/declarative-gridmesh.png Binary files differdeleted file mode 100644 index 6007d3b9e3..0000000000 --- a/src/qml/doc/images/declarative-gridmesh.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-item_opacity1.png b/src/qml/doc/images/declarative-item_opacity1.png Binary files differdeleted file mode 100644 index cde973be8d..0000000000 --- a/src/qml/doc/images/declarative-item_opacity1.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-item_opacity2.png b/src/qml/doc/images/declarative-item_opacity2.png Binary files differdeleted file mode 100644 index 8627360717..0000000000 --- a/src/qml/doc/images/declarative-item_opacity2.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-item_stacking1.png b/src/qml/doc/images/declarative-item_stacking1.png Binary files differdeleted file mode 100644 index 18f41484e5..0000000000 --- a/src/qml/doc/images/declarative-item_stacking1.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-item_stacking2.png b/src/qml/doc/images/declarative-item_stacking2.png Binary files differdeleted file mode 100644 index 7a71bcd36d..0000000000 --- a/src/qml/doc/images/declarative-item_stacking2.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-item_stacking3.png b/src/qml/doc/images/declarative-item_stacking3.png Binary files differdeleted file mode 100644 index cde973be8d..0000000000 --- a/src/qml/doc/images/declarative-item_stacking3.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-item_stacking4.png b/src/qml/doc/images/declarative-item_stacking4.png Binary files differdeleted file mode 100644 index 3fdf627f1a..0000000000 --- a/src/qml/doc/images/declarative-item_stacking4.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-largearc.png b/src/qml/doc/images/declarative-largearc.png Binary files differdeleted file mode 100644 index 9bb94b362e..0000000000 --- a/src/qml/doc/images/declarative-largearc.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-nopercent.png b/src/qml/doc/images/declarative-nopercent.png Binary files differdeleted file mode 100644 index 28b00a91e7..0000000000 --- a/src/qml/doc/images/declarative-nopercent.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-patharc.png b/src/qml/doc/images/declarative-patharc.png Binary files differdeleted file mode 100644 index 81c9b803e5..0000000000 --- a/src/qml/doc/images/declarative-patharc.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-pathattribute.png b/src/qml/doc/images/declarative-pathattribute.png Binary files differdeleted file mode 100644 index 57cd049e04..0000000000 --- a/src/qml/doc/images/declarative-pathattribute.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-pathcubic.png b/src/qml/doc/images/declarative-pathcubic.png Binary files differdeleted file mode 100644 index ffbca5d91e..0000000000 --- a/src/qml/doc/images/declarative-pathcubic.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-pathcurve.png b/src/qml/doc/images/declarative-pathcurve.png Binary files differdeleted file mode 100644 index c585cff0f0..0000000000 --- a/src/qml/doc/images/declarative-pathcurve.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-pathquad.png b/src/qml/doc/images/declarative-pathquad.png Binary files differdeleted file mode 100644 index 65f199974f..0000000000 --- a/src/qml/doc/images/declarative-pathquad.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-pathsvg.png b/src/qml/doc/images/declarative-pathsvg.png Binary files differdeleted file mode 100644 index 949149e722..0000000000 --- a/src/qml/doc/images/declarative-pathsvg.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-percent.png b/src/qml/doc/images/declarative-percent.png Binary files differdeleted file mode 100644 index c277055299..0000000000 --- a/src/qml/doc/images/declarative-percent.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-qtlogo-preserveaspectcrop.png b/src/qml/doc/images/declarative-qtlogo-preserveaspectcrop.png Binary files differdeleted file mode 100644 index 64fb086fac..0000000000 --- a/src/qml/doc/images/declarative-qtlogo-preserveaspectcrop.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-qtlogo-preserveaspectfit.png b/src/qml/doc/images/declarative-qtlogo-preserveaspectfit.png Binary files differdeleted file mode 100644 index 2585fa5f5f..0000000000 --- a/src/qml/doc/images/declarative-qtlogo-preserveaspectfit.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-qtlogo-stretch.png b/src/qml/doc/images/declarative-qtlogo-stretch.png Binary files differdeleted file mode 100644 index 32a0114e4e..0000000000 --- a/src/qml/doc/images/declarative-qtlogo-stretch.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-qtlogo-tile.png b/src/qml/doc/images/declarative-qtlogo-tile.png Binary files differdeleted file mode 100644 index 7d1b9d0485..0000000000 --- a/src/qml/doc/images/declarative-qtlogo-tile.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-qtlogo-tilehorizontally.png b/src/qml/doc/images/declarative-qtlogo-tilehorizontally.png Binary files differdeleted file mode 100644 index 367a8c7d0b..0000000000 --- a/src/qml/doc/images/declarative-qtlogo-tilehorizontally.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-qtlogo-tilevertically.png b/src/qml/doc/images/declarative-qtlogo-tilevertically.png Binary files differdeleted file mode 100644 index 68afafa8c3..0000000000 --- a/src/qml/doc/images/declarative-qtlogo-tilevertically.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-qtlogo.png b/src/qml/doc/images/declarative-qtlogo.png Binary files differdeleted file mode 100644 index 940d159ae4..0000000000 --- a/src/qml/doc/images/declarative-qtlogo.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-rect.png b/src/qml/doc/images/declarative-rect.png Binary files differdeleted file mode 100644 index 173759ae57..0000000000 --- a/src/qml/doc/images/declarative-rect.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-rect_gradient.png b/src/qml/doc/images/declarative-rect_gradient.png Binary files differdeleted file mode 100644 index f79d579bec..0000000000 --- a/src/qml/doc/images/declarative-rect_gradient.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-rotation.png b/src/qml/doc/images/declarative-rotation.png Binary files differdeleted file mode 100644 index b4031f5ae2..0000000000 --- a/src/qml/doc/images/declarative-rotation.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-scale.png b/src/qml/doc/images/declarative-scale.png Binary files differdeleted file mode 100644 index bab729e216..0000000000 --- a/src/qml/doc/images/declarative-scale.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-scalegrid.png b/src/qml/doc/images/declarative-scalegrid.png Binary files differdeleted file mode 100644 index 32d8712568..0000000000 --- a/src/qml/doc/images/declarative-scalegrid.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-shadereffectitem.png b/src/qml/doc/images/declarative-shadereffectitem.png Binary files differdeleted file mode 100644 index 2c8e8447e7..0000000000 --- a/src/qml/doc/images/declarative-shadereffectitem.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-shadereffectsource.png b/src/qml/doc/images/declarative-shadereffectsource.png Binary files differdeleted file mode 100644 index 86d6d1ea35..0000000000 --- a/src/qml/doc/images/declarative-shadereffectsource.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-text.png b/src/qml/doc/images/declarative-text.png Binary files differdeleted file mode 100644 index c1a4112500..0000000000 --- a/src/qml/doc/images/declarative-text.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-textedit.gif b/src/qml/doc/images/declarative-textedit.gif Binary files differdeleted file mode 100644 index 7186eb9f4f..0000000000 --- a/src/qml/doc/images/declarative-textedit.gif +++ /dev/null diff --git a/src/qml/doc/images/declarative-textformat.png b/src/qml/doc/images/declarative-textformat.png Binary files differdeleted file mode 100644 index ade1b45429..0000000000 --- a/src/qml/doc/images/declarative-textformat.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-textstyle.png b/src/qml/doc/images/declarative-textstyle.png Binary files differdeleted file mode 100644 index 858c1bcbff..0000000000 --- a/src/qml/doc/images/declarative-textstyle.png +++ /dev/null diff --git a/src/qml/doc/images/declarative-transformorigin.png b/src/qml/doc/images/declarative-transformorigin.png Binary files differdeleted file mode 100644 index 4af320fbc5..0000000000 --- a/src/qml/doc/images/declarative-transformorigin.png +++ /dev/null diff --git a/src/qml/doc/images/flickable.gif b/src/qml/doc/images/flickable.gif Binary files differdeleted file mode 100644 index f7a3319496..0000000000 --- a/src/qml/doc/images/flickable.gif +++ /dev/null diff --git a/src/qml/doc/images/flipable.gif b/src/qml/doc/images/flipable.gif Binary files differdeleted file mode 100644 index fd187906bb..0000000000 --- a/src/qml/doc/images/flipable.gif +++ /dev/null diff --git a/src/qml/doc/images/gridLayout_example.png b/src/qml/doc/images/gridLayout_example.png Binary files differdeleted file mode 100644 index 6b120e9639..0000000000 --- a/src/qml/doc/images/gridLayout_example.png +++ /dev/null diff --git a/src/qml/doc/images/gridview-highlight.png b/src/qml/doc/images/gridview-highlight.png Binary files differdeleted file mode 100644 index b54af37f93..0000000000 --- a/src/qml/doc/images/gridview-highlight.png +++ /dev/null diff --git a/src/qml/doc/images/gridview-layout-lefttoright-ltr-btt.png b/src/qml/doc/images/gridview-layout-lefttoright-ltr-btt.png Binary files differdeleted file mode 100644 index 4439f8370a..0000000000 --- a/src/qml/doc/images/gridview-layout-lefttoright-ltr-btt.png +++ /dev/null diff --git a/src/qml/doc/images/gridview-layout-lefttoright-ltr-ttb.png b/src/qml/doc/images/gridview-layout-lefttoright-ltr-ttb.png Binary files differdeleted file mode 100644 index af745b7d1e..0000000000 --- a/src/qml/doc/images/gridview-layout-lefttoright-ltr-ttb.png +++ /dev/null diff --git a/src/qml/doc/images/gridview-layout-lefttoright-rtl-btt.png b/src/qml/doc/images/gridview-layout-lefttoright-rtl-btt.png Binary files differdeleted file mode 100644 index bc7e568972..0000000000 --- a/src/qml/doc/images/gridview-layout-lefttoright-rtl-btt.png +++ /dev/null diff --git a/src/qml/doc/images/gridview-layout-lefttoright-rtl-ttb.png b/src/qml/doc/images/gridview-layout-lefttoright-rtl-ttb.png Binary files differdeleted file mode 100644 index 3ebf74fae5..0000000000 --- a/src/qml/doc/images/gridview-layout-lefttoright-rtl-ttb.png +++ /dev/null diff --git a/src/qml/doc/images/gridview-layout-toptobottom-ltr-btt.png b/src/qml/doc/images/gridview-layout-toptobottom-ltr-btt.png Binary files differdeleted file mode 100644 index b60ab4b5e7..0000000000 --- a/src/qml/doc/images/gridview-layout-toptobottom-ltr-btt.png +++ /dev/null diff --git a/src/qml/doc/images/gridview-layout-toptobottom-ltr-ttb.png b/src/qml/doc/images/gridview-layout-toptobottom-ltr-ttb.png Binary files differdeleted file mode 100644 index 9078cbde6f..0000000000 --- a/src/qml/doc/images/gridview-layout-toptobottom-ltr-ttb.png +++ /dev/null diff --git a/src/qml/doc/images/gridview-layout-toptobottom-rtl-btt.png b/src/qml/doc/images/gridview-layout-toptobottom-rtl-btt.png Binary files differdeleted file mode 100644 index 0d0f095598..0000000000 --- a/src/qml/doc/images/gridview-layout-toptobottom-rtl-btt.png +++ /dev/null diff --git a/src/qml/doc/images/gridview-layout-toptobottom-rtl-ttb.png b/src/qml/doc/images/gridview-layout-toptobottom-rtl-ttb.png Binary files differdeleted file mode 100644 index c1c353a4da..0000000000 --- a/src/qml/doc/images/gridview-layout-toptobottom-rtl-ttb.png +++ /dev/null diff --git a/src/qml/doc/images/gridview-simple.png b/src/qml/doc/images/gridview-simple.png Binary files differdeleted file mode 100644 index a102939f2b..0000000000 --- a/src/qml/doc/images/gridview-simple.png +++ /dev/null diff --git a/src/qml/doc/images/horizontalpositioner_example.png b/src/qml/doc/images/horizontalpositioner_example.png Binary files differdeleted file mode 100644 index 42f90ec7ae..0000000000 --- a/src/qml/doc/images/horizontalpositioner_example.png +++ /dev/null diff --git a/src/qml/doc/images/imageprovider.png b/src/qml/doc/images/imageprovider.png Binary files differdeleted file mode 100644 index 422103cb07..0000000000 --- a/src/qml/doc/images/imageprovider.png +++ /dev/null diff --git a/src/qml/doc/images/layoutmirroring.png b/src/qml/doc/images/layoutmirroring.png Binary files differdeleted file mode 100644 index df90ac4f9a..0000000000 --- a/src/qml/doc/images/layoutmirroring.png +++ /dev/null diff --git a/src/qml/doc/images/listview-highlight.png b/src/qml/doc/images/listview-highlight.png Binary files differdeleted file mode 100644 index dc5c6b3b57..0000000000 --- a/src/qml/doc/images/listview-highlight.png +++ /dev/null diff --git a/src/qml/doc/images/listview-layout-bottomtotop.png b/src/qml/doc/images/listview-layout-bottomtotop.png Binary files differdeleted file mode 100644 index 980f81d07f..0000000000 --- a/src/qml/doc/images/listview-layout-bottomtotop.png +++ /dev/null diff --git a/src/qml/doc/images/listview-layout-lefttoright.png b/src/qml/doc/images/listview-layout-lefttoright.png Binary files differdeleted file mode 100644 index 2ee0e4c4ff..0000000000 --- a/src/qml/doc/images/listview-layout-lefttoright.png +++ /dev/null diff --git a/src/qml/doc/images/listview-layout-righttoleft.png b/src/qml/doc/images/listview-layout-righttoleft.png Binary files differdeleted file mode 100644 index 2c54a2a7b1..0000000000 --- a/src/qml/doc/images/listview-layout-righttoleft.png +++ /dev/null diff --git a/src/qml/doc/images/listview-layout-toptobottom.png b/src/qml/doc/images/listview-layout-toptobottom.png Binary files differdeleted file mode 100644 index 2054a5743b..0000000000 --- a/src/qml/doc/images/listview-layout-toptobottom.png +++ /dev/null diff --git a/src/qml/doc/images/listview-simple.png b/src/qml/doc/images/listview-simple.png Binary files differdeleted file mode 100644 index 71a1c5172f..0000000000 --- a/src/qml/doc/images/listview-simple.png +++ /dev/null diff --git a/src/qml/doc/images/parentchange.png b/src/qml/doc/images/parentchange.png Binary files differdeleted file mode 100644 index 93206fbbb2..0000000000 --- a/src/qml/doc/images/parentchange.png +++ /dev/null diff --git a/src/qml/doc/images/pathview.gif b/src/qml/doc/images/pathview.gif Binary files differdeleted file mode 100644 index 4052eb264b..0000000000 --- a/src/qml/doc/images/pathview.gif +++ /dev/null diff --git a/src/qml/doc/images/positioner-example.png b/src/qml/doc/images/positioner-example.png Binary files differdeleted file mode 100644 index 636eeb7a13..0000000000 --- a/src/qml/doc/images/positioner-example.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-inback.png b/src/qml/doc/images/qeasingcurve-inback.png Binary files differdeleted file mode 100644 index 0064cb341c..0000000000 --- a/src/qml/doc/images/qeasingcurve-inback.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-inbounce.png b/src/qml/doc/images/qeasingcurve-inbounce.png Binary files differdeleted file mode 100644 index eaa64f8c41..0000000000 --- a/src/qml/doc/images/qeasingcurve-inbounce.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-incirc.png b/src/qml/doc/images/qeasingcurve-incirc.png Binary files differdeleted file mode 100644 index 7bd0f09d41..0000000000 --- a/src/qml/doc/images/qeasingcurve-incirc.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-incubic.png b/src/qml/doc/images/qeasingcurve-incubic.png Binary files differdeleted file mode 100644 index 1ac9eafba5..0000000000 --- a/src/qml/doc/images/qeasingcurve-incubic.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-inelastic.png b/src/qml/doc/images/qeasingcurve-inelastic.png Binary files differdeleted file mode 100644 index f976b5a576..0000000000 --- a/src/qml/doc/images/qeasingcurve-inelastic.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-inexpo.png b/src/qml/doc/images/qeasingcurve-inexpo.png Binary files differdeleted file mode 100644 index 1af3652985..0000000000 --- a/src/qml/doc/images/qeasingcurve-inexpo.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-inoutback.png b/src/qml/doc/images/qeasingcurve-inoutback.png Binary files differdeleted file mode 100644 index 480bc051ef..0000000000 --- a/src/qml/doc/images/qeasingcurve-inoutback.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-inoutbounce.png b/src/qml/doc/images/qeasingcurve-inoutbounce.png Binary files differdeleted file mode 100644 index de623091cf..0000000000 --- a/src/qml/doc/images/qeasingcurve-inoutbounce.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-inoutcirc.png b/src/qml/doc/images/qeasingcurve-inoutcirc.png Binary files differdeleted file mode 100644 index b4be8ac21e..0000000000 --- a/src/qml/doc/images/qeasingcurve-inoutcirc.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-inoutcubic.png b/src/qml/doc/images/qeasingcurve-inoutcubic.png Binary files differdeleted file mode 100644 index 49dfbef1b6..0000000000 --- a/src/qml/doc/images/qeasingcurve-inoutcubic.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-inoutelastic.png b/src/qml/doc/images/qeasingcurve-inoutelastic.png Binary files differdeleted file mode 100644 index 5b0e54a019..0000000000 --- a/src/qml/doc/images/qeasingcurve-inoutelastic.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-inoutexpo.png b/src/qml/doc/images/qeasingcurve-inoutexpo.png Binary files differdeleted file mode 100644 index 776984a113..0000000000 --- a/src/qml/doc/images/qeasingcurve-inoutexpo.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-inoutquad.png b/src/qml/doc/images/qeasingcurve-inoutquad.png Binary files differdeleted file mode 100644 index 264333085a..0000000000 --- a/src/qml/doc/images/qeasingcurve-inoutquad.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-inoutquart.png b/src/qml/doc/images/qeasingcurve-inoutquart.png Binary files differdeleted file mode 100644 index 31fc0c8852..0000000000 --- a/src/qml/doc/images/qeasingcurve-inoutquart.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-inoutquint.png b/src/qml/doc/images/qeasingcurve-inoutquint.png Binary files differdeleted file mode 100644 index 4d7a745be6..0000000000 --- a/src/qml/doc/images/qeasingcurve-inoutquint.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-inoutsine.png b/src/qml/doc/images/qeasingcurve-inoutsine.png Binary files differdeleted file mode 100644 index 012ff751c9..0000000000 --- a/src/qml/doc/images/qeasingcurve-inoutsine.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-inquad.png b/src/qml/doc/images/qeasingcurve-inquad.png Binary files differdeleted file mode 100644 index e697c208a5..0000000000 --- a/src/qml/doc/images/qeasingcurve-inquad.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-inquart.png b/src/qml/doc/images/qeasingcurve-inquart.png Binary files differdeleted file mode 100644 index 6d6517551e..0000000000 --- a/src/qml/doc/images/qeasingcurve-inquart.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-inquint.png b/src/qml/doc/images/qeasingcurve-inquint.png Binary files differdeleted file mode 100644 index faaaea71fd..0000000000 --- a/src/qml/doc/images/qeasingcurve-inquint.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-insine.png b/src/qml/doc/images/qeasingcurve-insine.png Binary files differdeleted file mode 100644 index 09449034b5..0000000000 --- a/src/qml/doc/images/qeasingcurve-insine.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-linear.png b/src/qml/doc/images/qeasingcurve-linear.png Binary files differdeleted file mode 100644 index fb3aaf3541..0000000000 --- a/src/qml/doc/images/qeasingcurve-linear.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-outback.png b/src/qml/doc/images/qeasingcurve-outback.png Binary files differdeleted file mode 100644 index 83b3fa233f..0000000000 --- a/src/qml/doc/images/qeasingcurve-outback.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-outbounce.png b/src/qml/doc/images/qeasingcurve-outbounce.png Binary files differdeleted file mode 100644 index 27ac979642..0000000000 --- a/src/qml/doc/images/qeasingcurve-outbounce.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-outcirc.png b/src/qml/doc/images/qeasingcurve-outcirc.png Binary files differdeleted file mode 100644 index 00193700e0..0000000000 --- a/src/qml/doc/images/qeasingcurve-outcirc.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-outcubic.png b/src/qml/doc/images/qeasingcurve-outcubic.png Binary files differdeleted file mode 100644 index 45477c045a..0000000000 --- a/src/qml/doc/images/qeasingcurve-outcubic.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-outelastic.png b/src/qml/doc/images/qeasingcurve-outelastic.png Binary files differdeleted file mode 100644 index 1d407ed845..0000000000 --- a/src/qml/doc/images/qeasingcurve-outelastic.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-outexpo.png b/src/qml/doc/images/qeasingcurve-outexpo.png Binary files differdeleted file mode 100644 index 56851554ed..0000000000 --- a/src/qml/doc/images/qeasingcurve-outexpo.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-outinback.png b/src/qml/doc/images/qeasingcurve-outinback.png Binary files differdeleted file mode 100644 index 4700ab02e8..0000000000 --- a/src/qml/doc/images/qeasingcurve-outinback.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-outinbounce.png b/src/qml/doc/images/qeasingcurve-outinbounce.png Binary files differdeleted file mode 100644 index 12cc1a8bd4..0000000000 --- a/src/qml/doc/images/qeasingcurve-outinbounce.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-outincirc.png b/src/qml/doc/images/qeasingcurve-outincirc.png Binary files differdeleted file mode 100644 index c8a5c86a23..0000000000 --- a/src/qml/doc/images/qeasingcurve-outincirc.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-outincubic.png b/src/qml/doc/images/qeasingcurve-outincubic.png Binary files differdeleted file mode 100644 index 42af870d99..0000000000 --- a/src/qml/doc/images/qeasingcurve-outincubic.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-outinelastic.png b/src/qml/doc/images/qeasingcurve-outinelastic.png Binary files differdeleted file mode 100644 index 308be57900..0000000000 --- a/src/qml/doc/images/qeasingcurve-outinelastic.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-outinexpo.png b/src/qml/doc/images/qeasingcurve-outinexpo.png Binary files differdeleted file mode 100644 index 0692baa264..0000000000 --- a/src/qml/doc/images/qeasingcurve-outinexpo.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-outinquad.png b/src/qml/doc/images/qeasingcurve-outinquad.png Binary files differdeleted file mode 100644 index 9e3cd83896..0000000000 --- a/src/qml/doc/images/qeasingcurve-outinquad.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-outinquart.png b/src/qml/doc/images/qeasingcurve-outinquart.png Binary files differdeleted file mode 100644 index 9a3c16f122..0000000000 --- a/src/qml/doc/images/qeasingcurve-outinquart.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-outinquint.png b/src/qml/doc/images/qeasingcurve-outinquint.png Binary files differdeleted file mode 100644 index add9feb26f..0000000000 --- a/src/qml/doc/images/qeasingcurve-outinquint.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-outinsine.png b/src/qml/doc/images/qeasingcurve-outinsine.png Binary files differdeleted file mode 100644 index 4bc2aaf9e3..0000000000 --- a/src/qml/doc/images/qeasingcurve-outinsine.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-outquad.png b/src/qml/doc/images/qeasingcurve-outquad.png Binary files differdeleted file mode 100644 index c505ff9e7b..0000000000 --- a/src/qml/doc/images/qeasingcurve-outquad.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-outquart.png b/src/qml/doc/images/qeasingcurve-outquart.png Binary files differdeleted file mode 100644 index 6eac058d18..0000000000 --- a/src/qml/doc/images/qeasingcurve-outquart.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-outquint.png b/src/qml/doc/images/qeasingcurve-outquint.png Binary files differdeleted file mode 100644 index 77a9ad417f..0000000000 --- a/src/qml/doc/images/qeasingcurve-outquint.png +++ /dev/null diff --git a/src/qml/doc/images/qeasingcurve-outsine.png b/src/qml/doc/images/qeasingcurve-outsine.png Binary files differdeleted file mode 100644 index d135b2f98c..0000000000 --- a/src/qml/doc/images/qeasingcurve-outsine.png +++ /dev/null diff --git a/src/qml/doc/images/qml-borderimage-normal-image.png b/src/qml/doc/images/qml-borderimage-normal-image.png Binary files differdeleted file mode 100644 index ae7460a7d7..0000000000 --- a/src/qml/doc/images/qml-borderimage-normal-image.png +++ /dev/null diff --git a/src/qml/doc/images/qml-borderimage-scaled.png b/src/qml/doc/images/qml-borderimage-scaled.png Binary files differdeleted file mode 100644 index 8035c79f37..0000000000 --- a/src/qml/doc/images/qml-borderimage-scaled.png +++ /dev/null diff --git a/src/qml/doc/images/qml-borderimage-tiled.png b/src/qml/doc/images/qml-borderimage-tiled.png Binary files differdeleted file mode 100644 index 14883d0dd6..0000000000 --- a/src/qml/doc/images/qml-borderimage-tiled.png +++ /dev/null diff --git a/src/qml/doc/images/qml-flow-snippet.png b/src/qml/doc/images/qml-flow-snippet.png Binary files differdeleted file mode 100644 index af873d1b4f..0000000000 --- a/src/qml/doc/images/qml-flow-snippet.png +++ /dev/null diff --git a/src/qml/doc/images/qml-gradient.png b/src/qml/doc/images/qml-gradient.png Binary files differdeleted file mode 100644 index 5eefdd2031..0000000000 --- a/src/qml/doc/images/qml-gradient.png +++ /dev/null diff --git a/src/qml/doc/images/qml-grid-no-spacing.png b/src/qml/doc/images/qml-grid-no-spacing.png Binary files differdeleted file mode 100644 index c2092e0bf9..0000000000 --- a/src/qml/doc/images/qml-grid-no-spacing.png +++ /dev/null diff --git a/src/qml/doc/images/qml-grid-spacing.png b/src/qml/doc/images/qml-grid-spacing.png Binary files differdeleted file mode 100644 index 1083bee59f..0000000000 --- a/src/qml/doc/images/qml-grid-spacing.png +++ /dev/null diff --git a/src/qml/doc/images/qml-item-canvas-arcTo.png b/src/qml/doc/images/qml-item-canvas-arcTo.png Binary files differdeleted file mode 100644 index 6bc187175a..0000000000 --- a/src/qml/doc/images/qml-item-canvas-arcTo.png +++ /dev/null diff --git a/src/qml/doc/images/qml-item-canvas-arcTo2.png b/src/qml/doc/images/qml-item-canvas-arcTo2.png Binary files differdeleted file mode 100644 index 5f9d32d8d3..0000000000 --- a/src/qml/doc/images/qml-item-canvas-arcTo2.png +++ /dev/null diff --git a/src/qml/doc/images/qml-item-canvas-bezierCurveTo.png b/src/qml/doc/images/qml-item-canvas-bezierCurveTo.png Binary files differdeleted file mode 100644 index ffbca5d91e..0000000000 --- a/src/qml/doc/images/qml-item-canvas-bezierCurveTo.png +++ /dev/null diff --git a/src/qml/doc/images/qml-item-canvas-context.gif b/src/qml/doc/images/qml-item-canvas-context.gif Binary files differdeleted file mode 100644 index f18e52ca05..0000000000 --- a/src/qml/doc/images/qml-item-canvas-context.gif +++ /dev/null diff --git a/src/qml/doc/images/qml-item-canvas-math-rotate.png b/src/qml/doc/images/qml-item-canvas-math-rotate.png Binary files differdeleted file mode 100644 index e80cc09eae..0000000000 --- a/src/qml/doc/images/qml-item-canvas-math-rotate.png +++ /dev/null diff --git a/src/qml/doc/images/qml-item-canvas-math.png b/src/qml/doc/images/qml-item-canvas-math.png Binary files differdeleted file mode 100644 index c039a38532..0000000000 --- a/src/qml/doc/images/qml-item-canvas-math.png +++ /dev/null diff --git a/src/qml/doc/images/qml-item-canvas-rotate.png b/src/qml/doc/images/qml-item-canvas-rotate.png Binary files differdeleted file mode 100644 index 20947fda49..0000000000 --- a/src/qml/doc/images/qml-item-canvas-rotate.png +++ /dev/null diff --git a/src/qml/doc/images/qml-item-canvas-scale.png b/src/qml/doc/images/qml-item-canvas-scale.png Binary files differdeleted file mode 100644 index 3b26fde871..0000000000 --- a/src/qml/doc/images/qml-item-canvas-scale.png +++ /dev/null diff --git a/src/qml/doc/images/qml-item-canvas-scalex.png b/src/qml/doc/images/qml-item-canvas-scalex.png Binary files differdeleted file mode 100644 index d4e76aa932..0000000000 --- a/src/qml/doc/images/qml-item-canvas-scalex.png +++ /dev/null diff --git a/src/qml/doc/images/qml-item-canvas-startAngle.png b/src/qml/doc/images/qml-item-canvas-startAngle.png Binary files differdeleted file mode 100644 index f81562e5e4..0000000000 --- a/src/qml/doc/images/qml-item-canvas-startAngle.png +++ /dev/null diff --git a/src/qml/doc/images/qml-listview-sections-example.png b/src/qml/doc/images/qml-listview-sections-example.png Binary files differdeleted file mode 100644 index 4e8f0768b4..0000000000 --- a/src/qml/doc/images/qml-listview-sections-example.png +++ /dev/null diff --git a/src/qml/doc/images/qml-mousearea-snippet.png b/src/qml/doc/images/qml-mousearea-snippet.png Binary files differdeleted file mode 100644 index 15229446c7..0000000000 --- a/src/qml/doc/images/qml-mousearea-snippet.png +++ /dev/null diff --git a/src/qml/doc/images/qml-xmllistmodel-example.png b/src/qml/doc/images/qml-xmllistmodel-example.png Binary files differdeleted file mode 100644 index be2d15d342..0000000000 --- a/src/qml/doc/images/qml-xmllistmodel-example.png +++ /dev/null diff --git a/src/qml/doc/images/rect-border-width.png b/src/qml/doc/images/rect-border-width.png Binary files differdeleted file mode 100644 index e232cf3ebd..0000000000 --- a/src/qml/doc/images/rect-border-width.png +++ /dev/null diff --git a/src/qml/doc/images/rect-color.png b/src/qml/doc/images/rect-color.png Binary files differdeleted file mode 100644 index b258ba9b6c..0000000000 --- a/src/qml/doc/images/rect-color.png +++ /dev/null diff --git a/src/qml/doc/images/rect-smooth.png b/src/qml/doc/images/rect-smooth.png Binary files differdeleted file mode 100644 index 7ffd8aba33..0000000000 --- a/src/qml/doc/images/rect-smooth.png +++ /dev/null diff --git a/src/qml/doc/images/repeater-index.png b/src/qml/doc/images/repeater-index.png Binary files differdeleted file mode 100644 index 3dbe6d0571..0000000000 --- a/src/qml/doc/images/repeater-index.png +++ /dev/null diff --git a/src/qml/doc/images/repeater-modeldata.png b/src/qml/doc/images/repeater-modeldata.png Binary files differdeleted file mode 100644 index 6d8df0d9d5..0000000000 --- a/src/qml/doc/images/repeater-modeldata.png +++ /dev/null diff --git a/src/qml/doc/images/repeater-simple.png b/src/qml/doc/images/repeater-simple.png Binary files differdeleted file mode 100644 index 6da62951dc..0000000000 --- a/src/qml/doc/images/repeater-simple.png +++ /dev/null diff --git a/src/qml/doc/images/repeater.png b/src/qml/doc/images/repeater.png Binary files differdeleted file mode 100644 index 973df27a74..0000000000 --- a/src/qml/doc/images/repeater.png +++ /dev/null diff --git a/src/qml/doc/images/translate.png b/src/qml/doc/images/translate.png Binary files differdeleted file mode 100644 index baf58b0eb6..0000000000 --- a/src/qml/doc/images/translate.png +++ /dev/null diff --git a/src/qml/doc/images/verticalpositioner_example.png b/src/qml/doc/images/verticalpositioner_example.png Binary files differdeleted file mode 100644 index 458dc7f481..0000000000 --- a/src/qml/doc/images/verticalpositioner_example.png +++ /dev/null diff --git a/src/qml/doc/images/verticalpositioner_transition.gif b/src/qml/doc/images/verticalpositioner_transition.gif Binary files differdeleted file mode 100644 index ed61adb5ab..0000000000 --- a/src/qml/doc/images/verticalpositioner_transition.gif +++ /dev/null diff --git a/src/qml/doc/images/viewtransitions-basic.gif b/src/qml/doc/images/viewtransitions-basic.gif Binary files differdeleted file mode 100644 index b2a6a618c0..0000000000 --- a/src/qml/doc/images/viewtransitions-basic.gif +++ /dev/null diff --git a/src/qml/doc/images/viewtransitions-delayedbyindex.gif b/src/qml/doc/images/viewtransitions-delayedbyindex.gif Binary files differdeleted file mode 100644 index 4ece2a2ffb..0000000000 --- a/src/qml/doc/images/viewtransitions-delayedbyindex.gif +++ /dev/null diff --git a/src/qml/doc/images/viewtransitions-intermediatemove.gif b/src/qml/doc/images/viewtransitions-intermediatemove.gif Binary files differdeleted file mode 100644 index e826183b19..0000000000 --- a/src/qml/doc/images/viewtransitions-intermediatemove.gif +++ /dev/null diff --git a/src/qml/doc/images/viewtransitions-interruptedbad.gif b/src/qml/doc/images/viewtransitions-interruptedbad.gif Binary files differdeleted file mode 100644 index d1f88f99bb..0000000000 --- a/src/qml/doc/images/viewtransitions-interruptedbad.gif +++ /dev/null diff --git a/src/qml/doc/images/viewtransitions-interruptedgood.gif b/src/qml/doc/images/viewtransitions-interruptedgood.gif Binary files differdeleted file mode 100644 index 1d59db387e..0000000000 --- a/src/qml/doc/images/viewtransitions-interruptedgood.gif +++ /dev/null diff --git a/src/qml/doc/images/viewtransitions-pathanim.gif b/src/qml/doc/images/viewtransitions-pathanim.gif Binary files differdeleted file mode 100644 index e6bc737456..0000000000 --- a/src/qml/doc/images/viewtransitions-pathanim.gif +++ /dev/null diff --git a/src/qml/doc/images/viewtransitions-scriptactionbad.gif b/src/qml/doc/images/viewtransitions-scriptactionbad.gif Binary files differdeleted file mode 100644 index 9e618d911c..0000000000 --- a/src/qml/doc/images/viewtransitions-scriptactionbad.gif +++ /dev/null diff --git a/src/qml/doc/images/visualitemmodel.png b/src/qml/doc/images/visualitemmodel.png Binary files differdeleted file mode 100644 index 5e6d1325b2..0000000000 --- a/src/qml/doc/images/visualitemmodel.png +++ /dev/null diff --git a/src/qml/doc/snippets/qml/codingconventions/myscript.js b/src/qml/doc/snippets/qml/codingconventions/myscript.js new file mode 100644 index 0000000000..cfa646250b --- /dev/null +++ b/src/qml/doc/snippets/qml/codingconventions/myscript.js @@ -0,0 +1,9 @@ +function calculateWidth(parent) +{ + var w = parent.width / 3 + // ... + // more javascript code + // ... + console.debug(w) + return w +} diff --git a/src/qml/doc/snippets/qml/righttoleft.qml b/src/qml/doc/snippets/qml/righttoleft.qml new file mode 100644 index 0000000000..0566be2f67 --- /dev/null +++ b/src/qml/doc/snippets/qml/righttoleft.qml @@ -0,0 +1,149 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import "righttoleft" + +Column { + width: 200 +//![0] +// automatically aligned to the left +Text { + text: "Phone" + width: 200 +} + +// automatically aligned to the right +Text { + text: "خامل" + width: 200 +} + +// aligned to the left +Text { + text: "خامل" + horizontalAlignment: Text.AlignLeft + width: 200 +} + +// aligned to the right +Text { + text: "خامل" + horizontalAlignment: Text.AlignLeft + LayoutMirroring.enabled: true + width: 200 +} +//![0] + +//![1] +// by default child items are positioned from left to right +Row { + Child {} + Child {} +} + +// position child items from right to left +Row { + layoutDirection: Qt.RightToLeft + Child {} + Child {} +} + +// position child items from left to right +Row { + LayoutMirroring.enabled: true + layoutDirection: Qt.RightToLeft + Child {} + Child {} +} +//![1] + +//![2] +Item { + height: 50; width: 150 + + LayoutMirroring.enabled: true + anchors.left: parent.left // anchor left becomes right + + Row { + // items flow from left to right (as per default) + Child {} + Child {} + Child {} + } +} +//![2] + +//![3] +Item { + height: 50; width: 150 + + LayoutMirroring.enabled: true + LayoutMirroring.childrenInherit: true + anchors.left: parent.left // anchor left becomes right + + Row { + // setting childrenInherit in the parent causes these + // items to flow from right to left instead + Child {} + Child {} + Child {} + } +} +//![3] + +//![4] +Rectangle { + color: "black" + height: 50; width: 50 + x: mirror(10) + function mirror(value) { + return LayoutMirroring.enabled ? (parent.width - width - value) : value; + } +} +//![4] + +//![5] +Image { + source: "arrow.png" + mirror: true +} +//![5] +} diff --git a/src/qml/doc/snippets/qml/righttoleft/Child.qml b/src/qml/doc/snippets/qml/righttoleft/Child.qml new file mode 100644 index 0000000000..50068540cb --- /dev/null +++ b/src/qml/doc/snippets/qml/righttoleft/Child.qml @@ -0,0 +1,51 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 + +Rectangle { + width: 50; height: 50 + color: "black" + Text { + color: "white" + text: String.fromCharCode(65 + Math.floor(26*Math.random())) + anchors.centerIn: parent + } +} diff --git a/src/qml/doc/src/qml/dynamicobjects.qdoc b/src/qml/doc/src/qml/dynamicobjects.qdoc index 6437ced886..caa4e63744 100644 --- a/src/qml/doc/src/qml/dynamicobjects.qdoc +++ b/src/qml/doc/src/qml/dynamicobjects.qdoc @@ -118,6 +118,8 @@ use the signal \c connect() method. See \l{QML Signal and Handler Event System#Connecting Signals to Methods and Signals} {Connecting Signals to Methods and Signals} for more information. +It is also possible to instantiate components without blocking via the +\l {Component::incubateObject()}{incubateObject()} function. \section2 Creating an Object from a String of QML @@ -149,7 +151,8 @@ The actual creation context depends on how an item is created: \li If \l{QML:Qt::createQmlObject()}{Qt.createQmlObject()} if called, the creation context is the context of the parent item passed to this method \li If a \c {Component{}} item is defined and \l {Component::createObject()}{createObject()} - is called on that item, the creation context is the context in which the \c Component is defined + or \l {Component::incubateObject()}{incubateObject()} is called on that item, + the creation context is the context in which the \c Component is defined \endlist Also, note that while dynamically created objects may be used the same as other objects, they diff --git a/src/qml/doc/src/qml/performance.qdoc b/src/qml/doc/src/qml/performance.qdoc index f6e56c9b71..081f6958d4 100644 --- a/src/qml/doc/src/qml/performance.qdoc +++ b/src/qml/doc/src/qml/performance.qdoc @@ -607,6 +607,30 @@ Rectangle { } \endcode +Note that this is still not as efficient as specifying a static size, so you should still specify static sizes via +the x, y, width and height properties. + +Item coordinates are always relative to their parent, so if you wanted to be a fixed offset from your parent's +0,0 coordinate you should not use anchors. For example the following items are in the same place, but the anchors +code is not as resource efficient as fixed positioning. + +\code +Rectangle { + width: 60 + height: 60 + Rectangle { + x: 20 + y: 20 + width: 20 + height: 20 + } + Rectangle { + anchors.fill: parent + anchors.margins: 20 + } +} +\endcode + \section1 Models and Views Most applications will have at least one model feeding data to a view. There are |
