diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-09-14 12:09:39 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-09-14 12:09:39 +0200 |
| commit | a6ca9472de6d4cbdb85dfceaa4f8c10b243cea07 (patch) | |
| tree | 719e2c3a1732ab0cc82c32d560484b5740f40a05 /src/quicktemplates2/qquickspinbox.cpp | |
| parent | 658b0f610a71fab8c103b913d2cfd11c3c7c6bef (diff) | |
| parent | b3619f32c20b5851ada0826ec2e7ddc2ec8a210b (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/quicktemplates2/qquicktextarea_p_p.h
src/quicktemplates2/qquicktextfield_p_p.h
Change-Id: Ie7b4a114ad27a4cad337c91e8ebcf696b0e845d7
Diffstat (limited to 'src/quicktemplates2/qquickspinbox.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickspinbox.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickspinbox.cpp b/src/quicktemplates2/qquickspinbox.cpp index 634e3732..fcce8374 100644 --- a/src/quicktemplates2/qquickspinbox.cpp +++ b/src/quicktemplates2/qquickspinbox.cpp @@ -821,8 +821,14 @@ void QQuickSpinButton::setIndicator(QQuickItem *indicator) if (d->indicator == indicator) return; - delete d->indicator; + QQuickControl *control = qobject_cast<QQuickControl*>(d->parent); + if (control) + QQuickControlPrivate::get(control)->deleteDelegate(d->indicator); + else + delete d->indicator; + d->indicator = indicator; + if (indicator) { if (!indicator->parentItem()) indicator->setParentItem(static_cast<QQuickItem *>(parent())); |