QmlDesigner.NodeInstances: Return the implicit size if the size is invalid

Task-number: QTCREATORBUG-5240

Change-Id: Ie8be3a2cc728805411a79c1f216ede566c641c17
Reviewed-on: http://codereview.qt.nokia.com/925
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

1 files changed, 18 insertions, 1 deletions

diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.cpp
index 3b3e7e3e54..acd46e7c16 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.cpp
@@ -271,7 +271,24 @@ bool SGItemNodeInstance::isSGItem() const
 
 QSizeF SGItemNodeInstance::size() const
 {
-    return QSizeF(sgItem()->width(), sgItem()->height());
+    double width;
+
+    if (QSGItemPrivate::get(sgItem())->widthValid) {
+        width = sgItem()->width();
+    } else {
+        width = sgItem()->implicitWidth();
+    }
+
+    double height;
+
+    if (QSGItemPrivate::get(sgItem())->heightValid) {
+        height = sgItem()->height();
+    } else {
+        height = sgItem()->implicitHeight();
+    }
+
+
+    return QSizeF(width, height);
 }
 
 QRectF SGItemNodeInstance::boundingRectWithStepChilds(QSGItem *parentItem) const