diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-11-03 18:20:15 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-11-03 19:20:42 +0100 |
| commit | 6c88fe58a6037d252f40bf00aa5052b0f724a862 (patch) | |
| tree | 9afdf0b638bc89e5e71eeac7b3c06ed53831e45b /src/imports/controls/Dial.qml | |
| parent | 83cbe4e899d2d22e923bdc10e90f91ef106edf58 (diff) | |
| parent | 3f646aca34c25f7cc36df2f988790bb238026422 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/imports/controls/BusyIndicator.qml
src/imports/controls/ProgressBar.qml
src/quicktemplates2/qquickpopup.cpp
src/quicktemplates2/qquickpopup_p_p.h
src/quicktemplates2/qquickstackview.cpp
Change-Id: I9a1028a991de9fc3e26d3f973106301e9ada631c
Diffstat (limited to 'src/imports/controls/Dial.qml')
| -rw-r--r-- | src/imports/controls/Dial.qml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/imports/controls/Dial.qml b/src/imports/controls/Dial.qml index e4579ca9..3e735c68 100644 --- a/src/imports/controls/Dial.qml +++ b/src/imports/controls/Dial.qml @@ -45,7 +45,6 @@ T.Dial { implicitWidth: 184 implicitHeight: 184 - //! [background] background: DialRing { width: control.availableWidth height: control.availableHeight @@ -53,9 +52,7 @@ T.Dial { progress: control.position opacity: control.enabled ? 1 : 0.3 } - //! [background] - //! [handle] handle: Image { id: handleItem x: background.x + background.width / 2 - handle.width / 2 @@ -78,5 +75,4 @@ T.Dial { } ] } - //! [handle] } |