From 9cee5d3b226728267540b7d584dea1b155fe1c5c Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Mon, 30 Jun 2014 19:14:33 +0200 Subject: [PATCH] QmlDesigner: Fix implicitHeight in resetVertical Task-number: QTCREATORBUG-11542 Change-Id: Ia69a95abe42ad0c10b8d65663d252f15cf38cf02 Reviewed-by: Tim Jenssen --- .../qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp | 2 +- .../qmlpuppet/instances/qmlgraphicsitemnodeinstance.cpp | 2 +- 2 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 7b62ce13263..9e100d02650 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp @@ -503,7 +503,7 @@ void QuickItemNodeInstance::resetVertical() if (m_height > 0.0) { setPropertyVariant("height", m_height); } else { - setPropertyVariant("height", quickItem()->implicitWidth()); + setPropertyVariant("height", quickItem()->implicitHeight()); } } diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.cpp index 09f90713668..0ca87b3166e 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.cpp @@ -184,7 +184,7 @@ void QmlGraphicsItemNodeInstance::resetVertical() if (m_height > 0.0) { setPropertyVariant("height", m_height); } else { - setPropertyVariant("height", qmlGraphicsItem()->implicitWidth()); + setPropertyVariant("height", qmlGraphicsItem()->implicitHeight()); } }