From f4638e34387e6acbd4097f21b5c56b5430065320 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Thu, 20 Sep 2012 12:52:06 +0200
Subject: [PATCH] avoid a first resize when a declarative item is assigned

---
 declarativeimports/core/declarativeitemcontainer.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/declarativeimports/core/declarativeitemcontainer.cpp b/declarativeimports/core/declarativeitemcontainer.cpp
index ef0eb77d0..a268da95f 100644
--- a/declarativeimports/core/declarativeitemcontainer.cpp
+++ b/declarativeimports/core/declarativeitemcontainer.cpp
@@ -35,13 +35,17 @@ void DeclarativeItemContainer::setDeclarativeItem(QDeclarativeItem *item, bool r
     if (m_declarativeItem) {
         disconnect(m_declarativeItem.data(), 0, this, 0);
     }
+
+    setMinimumWidth(item->implicitWidth());
+    setMinimumHeight(item->implicitHeight());
+
+    resize(item->width(), item->height());
+
     m_declarativeItem = item;
     if (reparent) {
         static_cast<QGraphicsItem *>(item)->setParentItem(this);
     }
-    setMinimumWidth(item->implicitWidth());
-    setMinimumHeight(item->implicitHeight());
-    resize(item->width(), item->height());
+
     connect(m_declarativeItem.data(), SIGNAL(widthChanged()), this, SLOT(widthChanged()));
     connect(m_declarativeItem.data(), SIGNAL(heightChanged()), this, SLOT(heightChanged()));
 }