Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

diff --cc src/declarative/items/qsgflickable.cpp
Simple merge

diff --cc src/declarative/items/qsgflickable_p_p.h
index fec78c0,9f212ee..114db53
--- 1/src/declarative/items/qsgflickable_p_p.h
--- 2/src/declarative/items/qsgflickable_p_p.h
+++ b/src/declarative/items/qsgflickable_p_p.h
@@@ -128,10 -140,10 +140,10 @@@ public
      void captureDelayedPress(QGraphicsSceneMouseEvent *event);
      void clearDelayedPress();
  
 -    void setRoundedViewportX(qreal x);
 -    void setRoundedViewportY(qreal y);
 +    void setViewportX(qreal x);
 +    void setViewportY(qreal y);
  
-     qreal overShootDistance(qreal velocity, qreal size);
+     qreal overShootDistance(qreal size);
  
      void itemGeometryChanged(QSGItem *, const QRectF &, const QRectF &);
  

diff --cc src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp
Simple merge