diff options
author | Martin Smith <msmith@trolltech.com> | 2009-04-29 07:01:56 (GMT) |
---|---|---|
committer | Martin Smith <msmith@trolltech.com> | 2009-04-29 07:01:56 (GMT) |
commit | 9bcade632b72da7384d0b006c8d9db26d2f4baa1 (patch) | |
tree | 8fa48e5fa27db70268894989c8baa4f623383d70 /src/declarative/fx/qfxwidgetcontainer.cpp | |
parent | c01d432060dccca5bc22dc5fd86eae97e1df8231 (diff) | |
parent | 86aa54ba75101121a55d340620d2273b82e6143d (diff) | |
download | Qt-9bcade632b72da7384d0b006c8d9db26d2f4baa1.zip Qt-9bcade632b72da7384d0b006c8d9db26d2f4baa1.tar.gz Qt-9bcade632b72da7384d0b006c8d9db26d2f4baa1.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/fx/qfxwidgetcontainer.cpp')
-rw-r--r-- | src/declarative/fx/qfxwidgetcontainer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/fx/qfxwidgetcontainer.cpp b/src/declarative/fx/qfxwidgetcontainer.cpp index f86c8dc..fccdad1 100644 --- a/src/declarative/fx/qfxwidgetcontainer.cpp +++ b/src/declarative/fx/qfxwidgetcontainer.cpp @@ -78,16 +78,16 @@ QGraphicsWidget *QFxWidgetContainer::graphicsWidget() const */ void QFxWidgetContainer::setGraphicsWidget(QGraphicsWidget *widget) { - if(widget == _graphicsWidget) + if (widget == _graphicsWidget) return; _graphicsWidget = widget; QSimpleCanvas *c = canvas(); - if(!c) + if (!c) return; - if(c->canvasMode() != QSimpleCanvas::GraphicsView) { + if (c->canvasMode() != QSimpleCanvas::GraphicsView) { qWarning("QFxWidgetContainer: Cannot add a widget to a non-graphicsview canvas. You might need to set QFX_USE_GRAPHICSVIEW=1"); return; } @@ -98,7 +98,7 @@ void QFxWidgetContainer::setGraphicsWidget(QGraphicsWidget *widget) void QFxWidgetContainer::canvasChanged() { - if(_graphicsWidget) { + if (_graphicsWidget) { QGraphicsWidget *w = _graphicsWidget; _graphicsWidget = 0; setGraphicsWidget(w); |