summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorMarco Bubke <marco.bubke@digia.com>2014-07-29 19:11:31 +0200
committerMarco Bubke <marco.bubke@digia.com>2014-07-30 12:34:58 +0200
commit0ee609f8fc8a86a1e5e4d4c950a47ba35f0adb66 (patch)
tree3b68c701e036b161061806f978a8a84645e12ac7 /share
parentb601b147abeabc5b12c169739cdff0328ed07a17 (diff)
downloadqt-creator-0ee609f8fc8a86a1e5e4d4c950a47ba35f0adb66.tar.gz
QmlDesigner: Fix reset width and height
Task-number: QTBUG-38426 Change-Id: I28e9ed70042c118ff65801c4d07e5a67dc7c3db1 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'share')
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
index 33931cbd70..9ed471cde5 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
@@ -325,7 +325,7 @@ QSizeF QuickItemNodeInstance::size() const
{
double width;
- if (DesignerSupport::isValidWidth(quickItem())) {
+ if (DesignerSupport::isValidHeight(quickItem())) { // isValidHeight is QQuickItemPrivate::get(item)->widthValid
width = quickItem()->width();
} else {
width = quickItem()->implicitWidth();
@@ -333,7 +333,7 @@ QSizeF QuickItemNodeInstance::size() const
double height;
- if (DesignerSupport::isValidHeight(quickItem())) {
+ if (DesignerSupport::isValidWidth(quickItem())) { // isValidWidth is QQuickItemPrivate::get(item)->heightValid
height = quickItem()->height();
} else {
height = quickItem()->implicitHeight();