diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-05-07 03:45:35 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-05-07 03:45:35 (GMT) |
| commit | acd9d0a135d054d9766e8c486c276c63c1771104 (patch) | |
| tree | 8d42e85304feac6470fda18590b3f1f5bbb26a5b /src/declarative/canvas/qsimplecanvas.cpp | |
| parent | 1d1acbdf3161bc5d79ddd73704687f1c604c766a (diff) | |
| parent | 2eb30b4a9c0176bdf8737f0ed8b1496770cc1d20 (diff) | |
| download | Qt-acd9d0a135d054d9766e8c486c276c63c1771104.zip Qt-acd9d0a135d054d9766e8c486c276c63c1771104.tar.gz Qt-acd9d0a135d054d9766e8c486c276c63c1771104.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) |