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/BusyIndicator.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/BusyIndicator.qml')
-rw-r--r-- | src/imports/controls/BusyIndicator.qml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/imports/controls/BusyIndicator.qml b/src/imports/controls/BusyIndicator.qml index 16fb6091..d0b02350 100644 --- a/src/imports/controls/BusyIndicator.qml +++ b/src/imports/controls/BusyIndicator.qml @@ -47,7 +47,6 @@ T.BusyIndicator { padding: 6 - //! [contentItem] contentItem: BusyIndicatorImpl { implicitWidth: 48 implicitHeight: 48 @@ -56,5 +55,4 @@ T.BusyIndicator { visible: control.running || animator.running Behavior on opacity { OpacityAnimator { id: animator; duration: 250 } } } - //! [contentItem] } |