feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Qml2Puppet: Fix compilation with qtdeclarative master

Browse Source 
e0cb13a5 - Move no-Gui related QML types from QtQuick into QtQml
55f6a109 - Renamed QQuickItem::pos property to position

Fix some warnings

Change-Id: Iec9fe3f543f900a177d55c5de3a636bb296cbc49
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Orgad Shaneh
2012-12-08 21:26:29 +02:00
committed by Orgad Shaneh
parent 1f74468a56
commit 6e7b51f941
3 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
View File

@@ -143,7 +143,7 @@ bool QuickItemNodeInstance::childItemsHaveContent(QQuickItem *quickItem)
QPointF QuickItemNodeInstance::position() const
{
return quickItem()->pos();
return quickItem()->position();
}
static QTransform transformForItem(QQuickItem *item, NodeInstanceServer *nodeInstanceServer)