Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

1 files changed, 0 insertions, 46 deletions

diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp
index d229eab..34af32a 100644
--- a/src/declarative/fx/qfxitem.cpp
+++ b/src/declarative/fx/qfxitem.cpp
@@ -1068,34 +1068,6 @@ void QFxItem::keyReleaseEvent(QKeyEvent *event)
 */
 
 /*!
-  \property QFxItem::id
-  This property holds the identifier for the item.
-  
-  The identifier can be used in bindings and other expressions to
-  refer to the item. For example:
-
-  \qml
-  Text { id: myText; ... }
-  Text { text: myText.text }
-  \endqml
-
-  The identifier is available throughout the \l {components}{component}
-  where it is declared.  The identifier must be unique in thecomponent.
-*/
-QString QFxItem::id() const
-{
-    Q_D(const QFxItem);
-    return d->_id;
-}
-
-void QFxItem::setId(const QString &id)
-{
-    Q_D(QFxItem);
-    setObjectName(id);
-    d->_id = id;
-}
-
-/*!
     \internal
 */
 QFxAnchorLine QFxItem::left() const
@@ -2017,24 +1989,6 @@ QPointF QFxItem::transformOriginPoint() const
     return d->transformOrigin();
 }
 
-qreal QFxItem::z() const
-{
-    return zValue();
-}
-
-void QFxItem::setZ(qreal z)
-{
-    if (z == this->z())
-        return;
-
-    if (z < 0)
-        setFlag(QGraphicsItem::ItemStacksBehindParent, true);
-    else
-        setFlag(QGraphicsItem::ItemStacksBehindParent, false);
-
-    setZValue(z);
-}
-
 qreal QFxItem::width() const
 {
     Q_D(const QFxItem);