diff options
author | Alan Alpert <416365416c@gmail.com> | 2013-09-13 16:34:07 -0700 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-30 23:33:08 +0100 |
commit | 2c750b45709fa164b758c5ec9e0e9ee744c51555 (patch) | |
tree | 01effa56bed73276b79b7f7dabf24c9fce7668de /src/particles/qquickimageparticle_p.h | |
parent | 639553f024f7b03706553ebb34825591be75eed2 (diff) |
Load image data on main thread
QQuickPixmap use should be done on the main thread, if not it can lead
to an exception when creating the file loading thread (owned by the
engine).
Change-Id: Id59cec4312ecdee537dcba85778bd90ea4433b2e
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'src/particles/qquickimageparticle_p.h')
-rw-r--r-- | src/particles/qquickimageparticle_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/particles/qquickimageparticle_p.h b/src/particles/qquickimageparticle_p.h index 8f2bb715f8..3a5d72e727 100644 --- a/src/particles/qquickimageparticle_p.h +++ b/src/particles/qquickimageparticle_p.h @@ -353,6 +353,7 @@ private Q_SLOTS: void spriteAdvance(int spriteIndex); void spritesUpdate(qreal time = 0 ); + void mainThreadFetchImageData(); void finishBuildParticleNodes(); private: struct ImageData { @@ -436,7 +437,7 @@ private: } EntryEffect m_entryEffect; Status m_status; - bool m_buildingNodes; + int m_startedImageLoading; }; QT_END_NAMESPACE |