diff options
author | Kai Koehne <kai.koehne@digia.com> | 2013-04-25 09:57:27 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@digia.com> | 2013-04-25 12:52:12 +0200 |
commit | a6cd9abcd1b3fb55c3e3cfd2d31756abcce2180f (patch) | |
tree | 3772ed144c1a4c5e92604d976403a2252678a25c /share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp | |
parent | d799bf31befdc4d5be36b1b807d5dd74dd0d5a72 (diff) | |
download | qt-creator-a6cd9abcd1b3fb55c3e3cfd2d31756abcce2180f.tar.gz |
QmlDesigner: Fix gcc compilation warnings
Fix warnings from gcc 4.8.
Change-Id: If4fc311ea021d1014141cb123f1d765577efd831
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Diffstat (limited to 'share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp')
-rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp index 85b8354fef..0aaa6abe49 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp @@ -116,7 +116,6 @@ void Qt5InformationNodeInstanceServer::collectItemChangesAndSendChangeCommands() QSet<ServerNodeInstance> informationChangedInstanceSet; QVector<InstancePropertyPair> propertyChangedList; - bool adjustSceneRect = false; if (quickView()) { foreach (QQuickItem *item, allItems()) { @@ -131,11 +130,6 @@ void Qt5InformationNodeInstanceServer::collectItemChangesAndSendChangeCommands() m_parentChangedSet.insert(instance); informationChangedInstanceSet.insert(instance); } -// if (d->geometryChanged) { -// if (instance.isRootNodeInstance()) -// declarativeView()->scene()->setSceneRect(item->boundingRect()); -// } - } } @@ -144,9 +138,6 @@ void Qt5InformationNodeInstanceServer::collectItemChangesAndSendChangeCommands() const QString propertyName = property.second; if (instance.isValid()) { - if (instance.isRootNodeInstance() && (propertyName == "width" || propertyName == "height")) - adjustSceneRect = true; - if (propertyName.contains("anchors")) informationChangedInstanceSet.insert(instance); @@ -170,13 +161,6 @@ void Qt5InformationNodeInstanceServer::collectItemChangesAndSendChangeCommands() m_parentChangedSet.clear(); } -// if (adjustSceneRect) { -// QRectF boundingRect = rootNodeInstance().boundingRect(); -// if (boundingRect.isValid()) { -// declarativeView()->setSceneRect(boundingRect); -// } -// } - if (!m_completedComponentList.isEmpty()) { nodeInstanceClient()->componentCompleted(createComponentCompletedCommand(m_completedComponentList)); m_completedComponentList.clear(); |