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

2 files changed, 7 insertions, 0 deletions

diff --git a/src/declarative/canvas/qsimplecanvas_graphicsview.cpp b/src/declarative/canvas/qsimplecanvas_graphicsview.cpp
index dd4012b..d9ff39b 100644
--- a/src/declarative/canvas/qsimplecanvas_graphicsview.cpp
+++ b/src/declarative/canvas/qsimplecanvas_graphicsview.cpp
@@ -64,6 +64,12 @@ QSimpleCanvasGraphicsView::~QSimpleCanvasGraphicsView()
     sceneMap.remove(&_scene);
 }
 
+void QSimpleCanvasGraphicsView::resizeEvent(QResizeEvent *e)
+{
+    _scene.setSceneRect(QRect(QPoint(0, 0), e->size()));
+    QGraphicsView::resizeEvent(e);
+}
+
 QSimpleGraphicsItem::QSimpleGraphicsItem(QSimpleCanvasItem *canvasItem)
 : /*scene(0),*/ owner(canvasItem)
 {
diff --git a/src/declarative/canvas/qsimplecanvas_p.h b/src/declarative/canvas/qsimplecanvas_p.h
index c900ccf..c2b5130 100644
--- a/src/declarative/canvas/qsimplecanvas_p.h
+++ b/src/declarative/canvas/qsimplecanvas_p.h
@@ -98,6 +98,7 @@ public:
 protected:
     virtual void paintEvent(QPaintEvent *);
     virtual void focusInEvent(QFocusEvent *);
+    virtual void resizeEvent(QResizeEvent *);
 
 private:
     QSimpleCanvasPrivate *canvas;