--- a/src/declarative/graphicsitems/qdeclarativeitem_p.h	Tue Jul 06 15:10:48 2010 +0300
+++ b/src/declarative/graphicsitems/qdeclarativeitem_p.h	Wed Aug 18 10:37:55 2010 +0300
@@ -83,16 +83,17 @@
 {
     Q_OBJECT
 public:
-    QDeclarativeContents();
+    QDeclarativeContents(QDeclarativeItem *item);
     ~QDeclarativeContents();
 
     QRectF rectF() const;
 
-    void setItem(QDeclarativeItem *item);
-
     void childRemoved(QDeclarativeItem *item);
     void childAdded(QDeclarativeItem *item);
 
+    void calcGeometry() { calcWidth(); calcHeight(); }
+    void complete();
+
 Q_SIGNALS:
     void rectChanged(QRectF);
 
@@ -119,11 +120,11 @@
 public:
     QDeclarativeItemPrivate()
     : _anchors(0), _contents(0),
-      _baselineOffset(0),
+      baselineOffset(0),
       _anchorLines(0),
       _stateGroup(0), origin(QDeclarativeItem::Center),
       widthValid(false), heightValid(false),
-      _componentComplete(true), _keepMouse(false),
+      componentComplete(true), keepMouse(false),
       smooth(false), transformOriginDirty(true), doneEventPreHandler(false), keyHandler(0),
       mWidth(0), mHeight(0), implicitWidth(0), implicitHeight(0)
     {
@@ -143,12 +144,10 @@
             QDeclarative_setParent_noEvent(q, parent);
             q->setParentItem(parent);
         }
-        _baselineOffset.invalidate();
+        baselineOffset.invalidate();
         mouseSetsFocus = false;
     }
 
-    QString _id;
-
     // Private Properties
     qreal width() const;
     void setWidth(qreal);
@@ -202,7 +201,7 @@
         if (!_anchors) {
             Q_Q(QDeclarativeItem);
             _anchors = new QDeclarativeAnchors(q);
-            if (!_componentComplete)
+            if (!componentComplete)
                 _anchors->classBegin();
         }
         return _anchors;
@@ -210,7 +209,7 @@
     QDeclarativeAnchors *_anchors;
     QDeclarativeContents *_contents;
 
-    QDeclarativeNullableValue<qreal> _baselineOffset;
+    QDeclarativeNullableValue<qreal> baselineOffset;
 
     struct AnchorLines {
         AnchorLines(QGraphicsObject *);
@@ -259,8 +258,8 @@
     QDeclarativeItem::TransformOrigin origin:4;
     bool widthValid:1;
     bool heightValid:1;
-    bool _componentComplete:1;
-    bool _keepMouse:1;
+    bool componentComplete:1;
+    bool keepMouse:1;
     bool smooth:1;
     bool transformOriginDirty : 1;
     bool doneEventPreHandler : 1;
@@ -285,10 +284,19 @@
     // Reimplemented from QGraphicsItemPrivate
     virtual void subFocusItemChange()
     {
-        emit q_func()->wantsFocusChanged(subFocusItem != 0);
+        if (flags & QGraphicsItem::ItemIsFocusScope || !parent)
+            emit q_func()->activeFocusChanged(subFocusItem != 0);
+        //see also QDeclarativeItemPrivate::focusChanged
     }
 
     // Reimplemented from QGraphicsItemPrivate
+    virtual void focusScopeItemChange(bool isSubFocusItem)
+    {
+        emit q_func()->focusChanged(isSubFocusItem);
+    }
+
+
+    // Reimplemented from QGraphicsItemPrivate
     virtual void siblingOrderChange()
     {
         Q_Q(QDeclarativeItem);
@@ -305,12 +313,11 @@
 
     virtual void focusChanged(bool);
 
-    static int consistentTime;
-    static QTime currentTime();
-    static void setConsistentTime(int t);
-    static void start(QTime &);
-    static int elapsed(QTime &);
-    static int restart(QTime &);
+    static qint64 consistentTime;
+    static void setConsistentTime(qint64 t);
+    static void start(QElapsedTimer &);
+    static qint64 elapsed(QElapsedTimer &);
+    static qint64 restart(QElapsedTimer &);
 };
 
 /*