diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-13 12:04:29 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-13 12:04:29 (GMT) |
| commit | 7d805a6717692b540c02b8caace25a0b47c7f0d6 (patch) | |
| tree | 3368927682df73ac437e8f321ba28e51d1463cd0 /examples | |
| parent | c6ed32dc7e9c8a566f376d1baa7e616a1019f9af (diff) | |
| parent | 58d0e46dcc50a3cddabc177c9dfdfec5c66e932d (diff) | |
| download | Qt-7d805a6717692b540c02b8caace25a0b47c7f0d6.zip Qt-7d805a6717692b540c02b8caace25a0b47c7f0d6.tar.gz Qt-7d805a6717692b540c02b8caace25a0b47c7f0d6.tar.bz2 | |
Merge branch '4.7' of ../oslo-staging-2 into 4.7
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/examples/simpletreemodel.qdoc
doc/src/examples/spinboxdelegate.qdoc
doc/src/getting-started/demos.qdoc
doc/src/getting-started/gettingstartedqml.qdoc
doc/src/index.qdoc
src/declarative/qml/qdeclarativeimageprovider.cpp
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/declarative/ui-components/dialcontrol/content/Dial.qml | 2 | ||||
| -rw-r--r-- | examples/declarative/ui-components/dialcontrol/dialcontrol.qml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/examples/declarative/ui-components/dialcontrol/content/Dial.qml b/examples/declarative/ui-components/dialcontrol/content/Dial.qml index b5074a64..3ffa09a 100644 --- a/examples/declarative/ui-components/dialcontrol/content/Dial.qml +++ b/examples/declarative/ui-components/dialcontrol/content/Dial.qml @@ -68,6 +68,7 @@ Item { transform: Rotation { id: needleRotation origin.x: 5; origin.y: 65 + //! [needle angle] angle: Math.min(Math.max(-130, root.value*2.6 - 130), 133) Behavior on angle { SpringAnimation { @@ -75,6 +76,7 @@ Item { damping: .15 } } + //! [needle angle] } } //! [needle] diff --git a/examples/declarative/ui-components/dialcontrol/dialcontrol.qml b/examples/declarative/ui-components/dialcontrol/dialcontrol.qml index 95df68c..46cc3e6 100644 --- a/examples/declarative/ui-components/dialcontrol/dialcontrol.qml +++ b/examples/declarative/ui-components/dialcontrol/dialcontrol.qml @@ -38,8 +38,10 @@ ** ****************************************************************************/ +//! [imports] import Qt 4.7 import "content" +//! [imports] //! [0] Rectangle { @@ -87,4 +89,4 @@ Rectangle { } } } -//! [0]
\ No newline at end of file +//! [0] |