summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-05-20 00:21:30 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-05-20 00:21:30 (GMT)
commit5b3b730c915f806cc6eb7d63779f8c45a4c2df69 (patch)
tree7dad5439c4edf51f33289f846be4afffac350c50 /src/declarative
parent5dfacf0602c7337efe90576eeb90f1326e94d500 (diff)
downloadQt-5b3b730c915f806cc6eb7d63779f8c45a4c2df69.zip
Qt-5b3b730c915f806cc6eb7d63779f8c45a4c2df69.tar.gz
Qt-5b3b730c915f806cc6eb7d63779f8c45a4c2df69.tar.bz2
compile
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/fx/qfxparticles.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/fx/qfxparticles.cpp b/src/declarative/fx/qfxparticles.cpp
index 930d7a3..67c1208 100644
--- a/src/declarative/fx/qfxparticles.cpp
+++ b/src/declarative/fx/qfxparticles.cpp
@@ -1129,7 +1129,7 @@ void QFxParticlesPainter::paintContents(QPainter &p)
update();//Should I need this? (GV does)
}
#elif defined(QFX_RENDER_OPENGL2)
-void QFxParticles::paintGLContents(GLPainter &p)
+void QFxParticles::paintGLContents(GLPainter &)
{
//painting is done by the ParticlesPainter, so it can have the right size
}
@@ -1155,8 +1155,8 @@ void QFxParticlesPainter::paintGLContents(GLPainter &p)
glBindTexture(GL_TEXTURE_2D, d->tex.texture());
- const int myX = (int)(x() + parent->x());
- const int myY = (int)(y() + parent->y());
+ const int myX = (int)(x() + parent()->x());
+ const int myY = (int)(y() + parent()->y());
float widthV = d->image.width();
float heightV = d->image.height();
for (int i = 0; i < d->particles.count(); ++i) {