diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:45:13 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-30 09:21:39 +0100 |
| commit | 61cb7ca7e8d8ebc5103870ae2795dbc65eb2c89f (patch) | |
| tree | dc28618df7f4ebfe398ec3a8597b61bbb492e42c /src/quicktemplates2/qquickstackview.cpp | |
| parent | 82eee3b411f23eb01ab3658d77504970ddb151ef (diff) | |
| parent | 1d39e62ada99d85a411e1d6fc26925e342f5b59b (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/imports/controls/MenuItem.qml
Change-Id: Id4cae0e53a58796694ad1fc9f8380b317ee62984
Diffstat (limited to 'src/quicktemplates2/qquickstackview.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickstackview.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickstackview.cpp b/src/quicktemplates2/qquickstackview.cpp index 674e6ee1..2f13b1a1 100644 --- a/src/quicktemplates2/qquickstackview.cpp +++ b/src/quicktemplates2/qquickstackview.cpp @@ -1029,6 +1029,7 @@ void QQuickStackView::componentComplete() element = QQuickStackElement::fromString(d->initialItem.toString(), this, &error); if (!error.isEmpty()) { d->warn(error); + delete element; } else if (d->pushElement(element)) { d->depthChange(d->elements.count(), oldDepth); d->setCurrentItem(element); |