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/qquickcombobox.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/qquickcombobox.cpp')
-rw-r--r-- | src/quicktemplates2/qquickcombobox.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp index 59c108c2..07d7d126 100644 --- a/src/quicktemplates2/qquickcombobox.cpp +++ b/src/quicktemplates2/qquickcombobox.cpp @@ -658,7 +658,7 @@ void QQuickComboBox::setIndicator(QQuickItem *indicator) if (d->indicator == indicator) return; - delete d->indicator; + d->deleteDelegate(d->indicator); d->indicator = indicator; if (indicator) { if (!indicator->parentItem()) @@ -686,7 +686,7 @@ void QQuickComboBox::setPopup(QQuickPopup *popup) if (d->popup == popup) return; - delete d->popup; + d->deleteDelegate(d->popup); if (popup) { popup->setAllowVerticalFlip(true); popup->setClosePolicy(QQuickPopup::CloseOnEscape | QQuickPopup::CloseOnPressOutsideParent); |