Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: Id669d5c1aab29965eac0dabd1cb497e908dac23e

1 files changed, 6 insertions, 3 deletions

diff --git a/src/render/materialsystem/qtechnique.cpp b/src/render/materialsystem/qtechnique.cpp
index 088716fb9..eca8b88c6 100644
--- a/src/render/materialsystem/qtechnique.cpp
+++ b/src/render/materialsystem/qtechnique.cpp
@@ -269,8 +269,9 @@ void QTechnique::removeFilterKey(QFilterKey *filterKey)
 {
     Q_ASSERT(filterKey);
     Q_D(QTechnique);
+    if (!d->m_filterKeys.removeOne(filterKey))
+        return;
     d->update();
-    d->m_filterKeys.removeOne(filterKey);
     // Remove bookkeeping connection
     d->unregisterDestructionHelper(filterKey);
 }
@@ -316,8 +317,9 @@ void QTechnique::removeParameter(QParameter *parameter)
 {
     Q_ASSERT(parameter);
     Q_D(QTechnique);
+    if (!d->m_parameters.removeOne(parameter))
+        return;
     d->update();
-    d->m_parameters.removeOne(parameter);
     // Remove bookkeeping connection
     d->unregisterDestructionHelper(parameter);
 }
@@ -353,8 +355,9 @@ void QTechnique::removeRenderPass(QRenderPass *pass)
 {
     Q_ASSERT(pass);
     Q_D(QTechnique);
+    if (!d->m_renderPasses.removeOne(pass))
+        return;
     d->update();
-    d->m_renderPasses.removeOne(pass);
     // Remove bookkeeping connection
     d->unregisterDestructionHelper(pass);
 }