diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2009-05-07 02:50:29 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2009-05-07 02:50:29 (GMT) |
commit | efc88aff5538d9dfff4f2abcd21d575815488c45 (patch) | |
tree | 0d1c0623053eb4a83a804fea6dbc31cf222cafce /src/declarative/canvas/qsimplecanvas.cpp | |
parent | e5a34bec3ee024d07bce6db52cd19d4a8e36696b (diff) | |
parent | 8abba3d2ec7f6520d87271a5b74ae7b021629784 (diff) | |
download | Qt-efc88aff5538d9dfff4f2abcd21d575815488c45.zip Qt-efc88aff5538d9dfff4f2abcd21d575815488c45.tar.gz Qt-efc88aff5538d9dfff4f2abcd21d575815488c45.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/canvas/qsimplecanvas.cpp')
-rw-r--r-- | src/declarative/canvas/qsimplecanvas.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/canvas/qsimplecanvas.cpp b/src/declarative/canvas/qsimplecanvas.cpp index 1911b35..ce02a4c 100644 --- a/src/declarative/canvas/qsimplecanvas.cpp +++ b/src/declarative/canvas/qsimplecanvas.cpp @@ -556,7 +556,7 @@ QSimpleCanvas::QSimpleCanvas(CanvasMode mode, QWidget *parent) QSimpleCanvas::QSimpleCanvas(QWidget *parent) : QWidget(parent), d(new QSimpleCanvasPrivate(this)) { - d->init(useGraphicsView()?GraphicsView:SimpleCanvas); + d->init(useGraphicsView()?SimpleCanvas:GraphicsView); } void QSimpleCanvasPrivate::init(QSimpleCanvas::CanvasMode mode) |