diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-29 10:48:54 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-29 10:48:54 +0100 |
| commit | 4e33b069c426c975319d91e11223114fd0d8ad40 (patch) | |
| tree | d73e1251bc313b7303fdb000c0789cdfb4c7bb1f /src/particles/qquickimageparticle_p.h | |
| parent | d9e70d1a49af347f79db7e64bdd8e2e8083a77b5 (diff) | |
| parent | 05d8ffb4dff5e693967c8ee7cee6d6158eadccbd (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/quick/items/qquickaccessibleattached_p.h
src/quick/items/qquickwindow.cpp
src/quick/scenegraph/qsgthreadedrenderloop.cpp
Change-Id: I8bf07487a75f9d1b0d6efa5914dd06875fc9654d
Diffstat (limited to 'src/particles/qquickimageparticle_p.h')
| -rw-r--r-- | src/particles/qquickimageparticle_p.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/particles/qquickimageparticle_p.h b/src/particles/qquickimageparticle_p.h index ac61ceeb10..657d945bca 100644 --- a/src/particles/qquickimageparticle_p.h +++ b/src/particles/qquickimageparticle_p.h @@ -352,17 +352,16 @@ private: QUrl source; QQuickPixmap pix; }; - ImageData *m_image; - ImageData *m_colorTable; - ImageData *m_sizeTable; - ImageData *m_opacityTable; + QScopedPointer<ImageData> m_image; + QScopedPointer<ImageData> m_colorTable; + QScopedPointer<ImageData> m_sizeTable; + QScopedPointer<ImageData> m_opacityTable; bool loadingSomething(); QColor m_color; qreal m_color_variation; - QSGGeometryNode *m_rootNode; QHash<int, QSGGeometryNode *> m_nodes; QHash<int, int> m_idxStarts;//TODO: Proper resizing will lead to needing a spriteEngine per particle - do this after sprite engine gains transparent sharing? QList<QPair<int, int> > m_startsIdx;//Same data, optimized for alternate retrieval |