summaryrefslogtreecommitdiffstats
path: root/src/render/texture/texture_p.h
diff options
context:
space:
mode:
authorMike Krus <mike.krus@kdab.com>2017-03-30 21:43:01 +0100
committerSean Harmer <sean.harmer@kdab.com>2017-05-20 17:55:15 +0000
commitb6a8f41242f7e16b3c26865055689bfa8c59e9ba (patch)
tree1f20230fd97b06b9029af467136f7ccde2319120 /src/render/texture/texture_p.h
parenta89a2b8bc32c440ee5515911a4a120fe232111a9 (diff)
Add support for downloading textures
If the source url is remote, use the download service to download the data. Task-number: QTBUG-57614 Change-Id: I0dd9d7dc9728458858ea4a0a579c1799eb9ceaf0 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/texture/texture_p.h')
-rw-r--r--src/render/texture/texture_p.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/render/texture/texture_p.h b/src/render/texture/texture_p.h
index f99d1d38b..18f650686 100644
--- a/src/render/texture/texture_p.h
+++ b/src/render/texture/texture_p.h
@@ -143,7 +143,7 @@ public:
void setTextureImageManager(TextureImageManager *manager);
void addDirtyFlag(DirtyFlags flags);
- inline DirtyFlags dirtyFlags() const { return m_dirty; }
+ DirtyFlags dirtyFlags();
void unsetDirty();
void addTextureImage(Qt3DCore::QNodeId id);
@@ -168,6 +168,7 @@ private:
QVector<HTextureImage> m_textureImages;
TextureImageManager *m_textureImageManager;
+ QMutex m_flagsMutex;
};
class TextureFunctor : public Qt3DCore::QBackendNodeMapper