summaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorToby Tomkins <toby.tomkins@nokia.com>2010-07-27 05:37:43 (GMT)
committerToby Tomkins <toby.tomkins@nokia.com>2010-07-27 05:47:52 (GMT)
commit0f989739f4b0ab72c3fa0a25e91edf7641b91fdb (patch)
treeb84ed690f4550c670da703172d56f1b53545b973 /src/imports
parent14bbc9fc1482f2f60d6acb5cd35cfe121e9d5b8e (diff)
downloadQt-0f989739f4b0ab72c3fa0a25e91edf7641b91fdb.zip
Qt-0f989739f4b0ab72c3fa0a25e91edf7641b91fdb.tar.gz
Qt-0f989739f4b0ab72c3fa0a25e91edf7641b91fdb.tar.bz2
Copied Qt QML 4.7 branch to release.
Reviewed-by: MArtin Jones
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/particles/qdeclarativeparticles.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/particles/qdeclarativeparticles.cpp b/src/imports/particles/qdeclarativeparticles.cpp
index cfe848c..b842109 100644
--- a/src/imports/particles/qdeclarativeparticles.cpp
+++ b/src/imports/particles/qdeclarativeparticles.cpp
@@ -1245,7 +1245,7 @@ void QDeclarativeParticles::burst(int count, int emissionRate)
void QDeclarativeParticlesPainter::updateSize()
{
- if (!d->_componentComplete)
+ if (!d->componentComplete)
return;
const int parentX = parentItem()->x();