Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (323 commits)
  Doc: these files are NOT part of the test suite of the Qt toolkit
  Autotest: make the licenseCheck test also check .qdoc files
  use egl properties when creating surfaces on symbian
  work around the current include file structure on Symbian^3
  Get rid of the dependency on the Symbian app layer
  Fix incorrect license headers
  Fix incorrect license headers
  tst_qnetworkreply: Check if TCP/HTTP connection got re-used
  Fix bad conflict resolution from 4baa9dfb5273d7b501dcb3f456983262c53cc8d1
  Fix building in a namespace on Windows
  Supressed Icon sizes on QPushButton in QS60Style
  Ensure that posted events are sent on Windows
  Fixed off-by-one blending errors in the NEON drawhelper code.
  Fixed libstdcpp.dll version autodetection for Symbian
  Fixed linkage failure when building qmake on Unix platforms
  Factored epocRoot implementation out of qmake
  Factored readRegistryKey implementation out of qmake
  Cetest extensions for Windows Mobile device power operations.
  Remote lib extensions for Windows Mobile device power operations.
  ColorDialog is always shown as stripped-down version (for QVGA)
  ...

1 files changed, 8 insertions, 5 deletions

diff --git a/demos/composition/composition.h b/demos/composition/composition.h
index 1123531..f5a9fc3 100644
--- a/demos/composition/composition.h
+++ b/demos/composition/composition.h
@@ -109,10 +109,6 @@ public:
 
     void paint(QPainter *);
 
-    void mousePressEvent(QMouseEvent *);
-    void mouseMoveEvent(QMouseEvent *);
-    void mouseReleaseEvent(QMouseEvent *);
-
     void setCirclePos(const QPointF &pos);
 
     QSize sizeHint() const { return QSize(500, 400); }
@@ -121,6 +117,12 @@ public:
     int circleColor() const { return m_circle_hue; }
     int circleAlpha() const { return m_circle_alpha; }
 
+protected:
+    void mousePressEvent(QMouseEvent *);
+    void mouseMoveEvent(QMouseEvent *);
+    void mouseReleaseEvent(QMouseEvent *);
+    void timerEvent(QTimerEvent *);
+
 public slots:
     void setClearMode() { m_composition_mode = QPainter::CompositionMode_Clear; update(); }
     void setSourceMode() { m_composition_mode = QPainter::CompositionMode_Source; update(); }
@@ -150,7 +152,7 @@ public slots:
 
     void setCircleAlpha(int alpha) { m_circle_alpha = alpha; update(); }
     void setCircleColor(int hue) { m_circle_hue = hue; update(); }
-    void setAnimationEnabled(bool enabled) { m_animation_enabled = enabled; update(); }
+    void setAnimationEnabled(bool enabled);
 
 private:
     void updateCirclePos();
@@ -177,6 +179,7 @@ private:
 
     ObjectType m_current_object;
     bool m_animation_enabled;
+    int m_animationTimer;
 
 #ifdef QT_OPENGL_SUPPORT
     QGLPixelBuffer *m_pbuffer;