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

Conflicts:
	doc/src/declarative/anchor-layout.qdoc

3 files changed, 6 insertions, 5 deletions

diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp
index 6cc6db7..cbddb91 100644
--- a/src/declarative/util/qmlanimation.cpp
+++ b/src/declarative/util/qmlanimation.cpp
@@ -407,12 +407,12 @@ void QmlAbstractAnimation::setGroup(QmlAnimationGroup *g)
     if (d->group == g)
         return;
     if (d->group)
-        static_cast<QmlAnimationGroupPrivate *>(d->group->d_ptr)->animations.removeAll(this);
+        static_cast<QmlAnimationGroupPrivate *>(d->group->d_func())->animations.removeAll(this);
 
     d->group = g;
 
-    if (d->group && !static_cast<QmlAnimationGroupPrivate *>(d->group->d_ptr)->animations.contains(this))
-        static_cast<QmlAnimationGroupPrivate *>(d->group->d_ptr)->animations.append(this);
+    if (d->group && !static_cast<QmlAnimationGroupPrivate *>(d->group->d_func())->animations.contains(this))
+        static_cast<QmlAnimationGroupPrivate *>(d->group->d_func())->animations.append(this);
 
     if (d->group)
         ((QAnimationGroup*)d->group->qtAnimation())->addAnimation(qtAnimation());
diff --git a/src/declarative/util/qmlanimation.h b/src/declarative/util/qmlanimation.h
index 67a2045..a898be8 100644
--- a/src/declarative/util/qmlanimation.h
+++ b/src/declarative/util/qmlanimation.h
@@ -355,6 +355,7 @@ public:
     virtual ~QmlAnimationGroup();
 
     QmlList<QmlAbstractAnimation *>* animations();
+    friend class QmlAbstractAnimation;
 };
 
 class QmlSequentialAnimation : public QmlAnimationGroup
diff --git a/src/declarative/util/qmlstate.cpp b/src/declarative/util/qmlstate.cpp
index e7149d5..a17d16e 100644
--- a/src/declarative/util/qmlstate.cpp
+++ b/src/declarative/util/qmlstate.cpp
@@ -281,7 +281,7 @@ QmlStatePrivate::generateActionList(QmlStateGroup *group) const
         QList<QmlState *> states = group->states();
         for (int ii = 0; ii < states.count(); ++ii)
             if (states.at(ii)->name() == extends)
-                applyList = static_cast<QmlStatePrivate*>(states.at(ii)->d_ptr)->generateActionList(group);
+                applyList = static_cast<QmlStatePrivate*>(states.at(ii)->d_func())->generateActionList(group);
     }
 
     foreach(QmlStateOperation *op, operations)
@@ -330,7 +330,7 @@ void QmlState::apply(QmlStateGroup *group, QmlTransition *trans, QmlState *rever
 
     if (revert) {
         QmlStatePrivate *revertPrivate =
-            static_cast<QmlStatePrivate*>(revert->d_ptr);
+            static_cast<QmlStatePrivate*>(revert->d_func());
         d->revertList = revertPrivate->revertList;
         revertPrivate->revertList.clear();
     }