diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-10 20:45:46 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-10 20:45:46 +0100 |
| commit | 6c090cd8d0e501b340190d96854145deb2299b26 (patch) | |
| tree | 73dbee34347724a55de8180d61caa3e78b512aa3 /examples/quick/customitems/dialcontrol/doc/src/dialcontrol.qdoc | |
| parent | ebc76aeea24389e8494b95fd3fbdc446dd62d441 (diff) | |
| parent | 74580d00921ce7cc6f8baf70b15903f5cf707b78 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.h
tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
tests/auto/quick/qquicktextedit/qquicktextedit.pro
tests/auto/quick/qquicktextinput/qquicktextinput.pro
Change-Id: I95d2c20a8619e5b8fa361c941a16dd8dce3e04e7
Diffstat (limited to 'examples/quick/customitems/dialcontrol/doc/src/dialcontrol.qdoc')
| -rw-r--r-- | examples/quick/customitems/dialcontrol/doc/src/dialcontrol.qdoc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/examples/quick/customitems/dialcontrol/doc/src/dialcontrol.qdoc b/examples/quick/customitems/dialcontrol/doc/src/dialcontrol.qdoc index 064dba51ef..9bc6a61716 100644 --- a/examples/quick/customitems/dialcontrol/doc/src/dialcontrol.qdoc +++ b/examples/quick/customitems/dialcontrol/doc/src/dialcontrol.qdoc @@ -42,6 +42,7 @@ /*! \title UI Components: Dial Control Example \example customitems/dialcontrol + \brief The Dial Control Example shows how to create a speedometer-type dial. This example shows how to create a dial-type control. It combines \l Image elements with \l Rotation transforms and \l SpringAnimation behaviors |