aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick3d/qquick3dsceneenvironment_p.h
diff options
context:
space:
mode:
authorAntti Määttä <[email protected]>2020-02-05 07:33:47 +0200
committerAntti Määttä <[email protected]>2020-02-11 08:41:12 +0200
commit4005e300d25e18bd0c3fae756ccf34b4b4f560f6 (patch)
treecc93964a74be08c79c699573ac88669ab05f49b1 /src/quick3d/qquick3dsceneenvironment_p.h
parent55c366cb8208bf469415f4d97fb80615b69bbc88 (diff)
Make property update connections unique
This way the same object can be used with multiple properties. Task-number: QTBUG-81851 Change-Id: I90c27d714bd7188f0050d472083c6a9b5c94ac9e Reviewed-by: Tomi Korpipää <[email protected]>
Diffstat (limited to 'src/quick3d/qquick3dsceneenvironment_p.h')
-rw-r--r--src/quick3d/qquick3dsceneenvironment_p.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick3d/qquick3dsceneenvironment_p.h b/src/quick3d/qquick3dsceneenvironment_p.h
index 19cef672..7419147f 100644
--- a/src/quick3d/qquick3dsceneenvironment_p.h
+++ b/src/quick3d/qquick3dsceneenvironment_p.h
@@ -193,6 +193,7 @@ protected:
void itemChange(ItemChange, const ItemChangeData &) override;
private:
+ using ConnectionMap = QHash<QByteArray, QMetaObject::Connection>;
friend class QQuick3DSceneRenderer;
QVector<QQuick3DEffect *> m_effects;
@@ -224,7 +225,7 @@ private:
float m_probeHorizon = -1.0f;
float m_probeFieldOfView = 180.0f;
- QHash<QObject*, QMetaObject::Connection> m_connections;
+ ConnectionMap m_connections;
bool m_depthTestEnabled = true;
bool m_depthPrePassEnabled = false;
};