summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksey Sidorov <gorthauer87@ya.ru>2012-09-05 18:23:51 +0400
committerMorten Johan Sørvig <morten.sorvig@digia.com>2012-09-28 11:18:24 +0200
commita0311b1dd0b5a46e42ed710b0ce436801d9687ce (patch)
tree2e49f59c17d8699e9ea9cfc615a988453e145fa2
parentff4803e406a52fb91220e8632ba15c1a5393d06f (diff)
downloadqtquickcontrols-a0311b1dd0b5a46e42ed710b0ce436801d9687ce.tar.gz
Fixed crash when destroying an linear layout item
Change-Id: I524d9b47dcc0a43da37463179ad56208450c5602 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
-rw-r--r--src/qdeclarativelinearlayout.cpp6
-rw-r--r--src/qdeclarativelinearlayout.h2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/qdeclarativelinearlayout.cpp b/src/qdeclarativelinearlayout.cpp
index a5e0260e..3bb93ace 100644
--- a/src/qdeclarativelinearlayout.cpp
+++ b/src/qdeclarativelinearlayout.cpp
@@ -53,6 +53,12 @@ QDeclarativeLinearLayout::QDeclarativeLinearLayout(Orientation orientation,
}
+QDeclarativeLinearLayout::~QDeclarativeLinearLayout()
+{
+ foreach (QDeclarativeItem *item, m_items)
+ removeLayoutItem(item);
+}
+
qreal QDeclarativeLinearLayout::spacing() const
{
return m_spacing;
diff --git a/src/qdeclarativelinearlayout.h b/src/qdeclarativelinearlayout.h
index ec207bfa..47f24c1f 100644
--- a/src/qdeclarativelinearlayout.h
+++ b/src/qdeclarativelinearlayout.h
@@ -56,7 +56,7 @@ public:
explicit QDeclarativeLinearLayout(Orientation orientation,
QDeclarativeItem *parent = 0);
- ~QDeclarativeLinearLayout() {}
+ ~QDeclarativeLinearLayout();
qreal spacing() const;
void setSpacing(qreal spacing);