diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2012-12-08 21:26:29 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2012-12-10 11:27:46 +0100 |
| commit | 6e7b51f941d2af0cf9caa15d8e99d3f311f82ac1 (patch) | |
| tree | 029011f587ce8189deea1723f3fb4bb8065bf217 /share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp | |
| parent | 1f74468a5666458343eb523729254352a5d776ba (diff) | |
Qml2Puppet: Fix compilation with qtdeclarative master
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>
Diffstat (limited to 'share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp')
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp index 25c34efb40..d9f8594798 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp @@ -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) |