summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-07-13 05:20:45 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-07-13 05:20:45 (GMT)
commit68df6c65d5de0c03fd2f1ce00540f419108327de (patch)
treeb90e97030905958c3e73415cf525f08bd93eb252 /src/declarative
parentf2c275992245b1e5e90bbac97c7d5f73f4710311 (diff)
parent66c9d55e58fd9ee9a80270e63a8ebba52db00904 (diff)
downloadQt-68df6c65d5de0c03fd2f1ce00540f419108327de.zip
Qt-68df6c65d5de0c03fd2f1ce00540f419108327de.tar.gz
Qt-68df6c65d5de0c03fd2f1ce00540f419108327de.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/canvas/qsimplecanvas_graphicsview.cpp6
-rw-r--r--src/declarative/canvas/qsimplecanvas_p.h1
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;