summaryrefslogtreecommitdiffstats
path: root/src/declarative/canvas/qsimplecanvas_p.h
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2009-04-29 07:01:56 (GMT)
committerMartin Smith <msmith@trolltech.com>2009-04-29 07:01:56 (GMT)
commit9bcade632b72da7384d0b006c8d9db26d2f4baa1 (patch)
tree8fa48e5fa27db70268894989c8baa4f623383d70 /src/declarative/canvas/qsimplecanvas_p.h
parentc01d432060dccca5bc22dc5fd86eae97e1df8231 (diff)
parent86aa54ba75101121a55d340620d2273b82e6143d (diff)
downloadQt-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/canvas/qsimplecanvas_p.h')
-rw-r--r--src/declarative/canvas/qsimplecanvas_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/canvas/qsimplecanvas_p.h b/src/declarative/canvas/qsimplecanvas_p.h
index 44e5a7e..7bc7330 100644
--- a/src/declarative/canvas/qsimplecanvas_p.h
+++ b/src/declarative/canvas/qsimplecanvas_p.h
@@ -176,7 +176,7 @@ public:
GLBasicShaders *basicShaders() const
{
#if defined(QFX_RENDER_OPENGL2)
- if(!basicShadersInstance)
+ if (!basicShadersInstance)
basicShadersInstance = new GLBasicShaders;
return basicShadersInstance;
#else