aboutsummaryrefslogtreecommitdiffstats
path: root/src/particles/qquickimageparticle_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/particles/qquickimageparticle_p.h')
-rw-r--r--src/particles/qquickimageparticle_p.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/particles/qquickimageparticle_p.h b/src/particles/qquickimageparticle_p.h
index 8f2bb715f8..e9328d79e5 100644
--- a/src/particles/qquickimageparticle_p.h
+++ b/src/particles/qquickimageparticle_p.h
@@ -343,8 +343,8 @@ protected:
virtual void commit(int gIdx, int pIdx);
QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *);
- void prepareNextFrame();
- void buildParticleNodes();
+ void prepareNextFrame(QSGNode**);
+ void buildParticleNodes(QSGNode**);
void sceneGraphInvalidated();
@@ -353,7 +353,8 @@ private Q_SLOTS:
void spriteAdvance(int spriteIndex);
void spritesUpdate(qreal time = 0 );
- void finishBuildParticleNodes();
+ void mainThreadFetchImageData();
+ void finishBuildParticleNodes(QSGNode **n);
private:
struct ImageData {
QUrl source;
@@ -436,7 +437,7 @@ private:
}
EntryEffect m_entryEffect;
Status m_status;
- bool m_buildingNodes;
+ int m_startedImageLoading;
};
QT_END_NAMESPACE