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

Conflicts:
	src/gui/graphicsview/qgraphicsitem.cpp

1 files changed, 8 insertions, 3 deletions

diff --git a/examples/animation/sub-attaq/graphicsscene.h b/examples/animation/sub-attaq/graphicsscene.h
index 875f59f..0840564 100644
--- a/examples/animation/sub-attaq/graphicsscene.h
+++ b/examples/animation/sub-attaq/graphicsscene.h
@@ -43,13 +43,13 @@
 #define __GRAPHICSSCENE__H__
 
 //Qt
-#include <QGraphicsScene>
-#include <QSet>
+#include <QtGui/QGraphicsScene>
+#include <QtCore/QSet>
 
 #if defined(QT_EXPERIMENTAL_SOLUTION)
 # include "qstate.h"
 #else
-# include <QState>
+# include <QtCore/QState>
 #endif
 
 
@@ -58,6 +58,7 @@ class SubMarine;
 class Torpedo;
 class Bomb;
 class PixmapItem;
+class ProgressItem;
 class QAction;
 
 class GraphicsScene : public QGraphicsScene
@@ -109,6 +110,7 @@ private slots:
 private:
     Mode mode;
     PixmapItem *backgroundItem;
+    ProgressItem *progressItem;
     QAction * newAction;
     QAction * quitAction;
     Boat *boat;
@@ -121,8 +123,11 @@ private:
 
     friend class PauseState;
     friend class PlayState;
+    friend class LevelState;
     friend class LostState;
     friend class WinState;
+    friend class WinTransition;
+    friend class UpdateScoreTransition;
 };
 
 #endif //__GRAPHICSSCENE__H__