1 files changed, 17 insertions, 2 deletions
diff --git a/src/quick/items/qquickopenglshadereffect.cpp b/src/quick/items/qquickopenglshadereffect.cpp
index 3f057ecd64..9d24a6c511 100644
--- a/src/quick/items/qquickopenglshadereffect.cpp
+++ b/src/quick/items/qquickopenglshadereffect.cpp
@@ -187,7 +187,7 @@ public:
 
     explicit MappedSlotObject(PropChangedFunc func)
         : QSlotObjectBase(&impl), _signalIndex(-1), func(func)
-    {}
+    { ref(); }
 
     void setSignalIndex(int idx) { _signalIndex = idx; }
     int signalIndex() const { return _signalIndex; }
@@ -215,6 +215,12 @@ private:
 };
 }
 
+QQuickOpenGLShaderEffectCommon::~QQuickOpenGLShaderEffectCommon()
+{
+    for (int shaderType = 0; shaderType < Key::ShaderTypeCount; ++shaderType)
+        clearSignalMappers(shaderType);
+}
+
 void QQuickOpenGLShaderEffectCommon::disconnectPropertySignals(QQuickItem *item, Key::ShaderType shaderType)
 {
     for (int i = 0; i < uniformData[shaderType].size(); ++i) {
@@ -363,7 +369,7 @@ void QQuickOpenGLShaderEffectCommon::updateShader(QQuickItem *item,
 {
     disconnectPropertySignals(item, shaderType);
     uniformData[shaderType].clear();
-    signalMappers[shaderType].clear();
+    clearSignalMappers(shaderType);
     if (shaderType == Key::VertexShader)
         attributes.clear();
 
@@ -593,6 +599,15 @@ void QQuickOpenGLShaderEffectCommon::propertyChanged(QQuickItem *item,
     }
 }
 
+void QQuickOpenGLShaderEffectCommon::clearSignalMappers(int shader)
+{
+    for (auto mapper : qAsConst(signalMappers[shader])) {
+        if (mapper)
+            mapper->destroyIfLastRef();
+    }
+    signalMappers[shader].clear();
+}
+
 QQuickOpenGLShaderEffect::QQuickOpenGLShaderEffect(QQuickShaderEffect *item, QObject *parent)
     : QObject(parent)
     , m_item(item)