diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-16 18:08:19 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-16 18:08:19 (GMT) |
| commit | 82440843435b8bf02391fae1c9df6f081a945a65 (patch) | |
| tree | 560873dbe432b3a55d1cc4ff8c47388e9498ff8d /examples | |
| parent | 6ddda99db20203917229e399c4b8d333a119c3d6 (diff) | |
| parent | 5b47a913473802d377ec303b425eb1ad0496f843 (diff) | |
| download | Qt-82440843435b8bf02391fae1c9df6f081a945a65.zip Qt-82440843435b8bf02391fae1c9df6f081a945a65.tar.gz Qt-82440843435b8bf02391fae1c9df6f081a945a65.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Translate bughowto.qdoc into zh_CN.
diagramscene example: fix leak and crashes.
qdoc: Reorganized the QML elements table to be a dictionary...
qgrayraster: Speed up rendering of small cubic splines.
Fix compilation: QT_NO_LINEEDIT
Doc: Removed invalid entities in documentation.
Doc: Fixes to Qt Quick documentation.
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] |