diff options
| author | Antti Määttä <antti.maatta@qt.io> | 2020-04-21 15:40:17 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-04-21 15:41:26 +0200 |
| commit | 18b319f919f71c6b476675d832d1b8a2bda118c2 (patch) | |
| tree | 0ed74eff9f5892dc372a136d05454c8213ad1d4c /src/animation | |
| parent | e326d8b7d7c96a628667d0a464f3c1e776d7cf1b (diff) | |
| parent | dec1f5912acb991985e96ca2cb7e5c265c737a6f (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/plugins/renderers/opengl/graphicshelpers/submissioncontext.cpp
src/plugins/renderers/opengl/graphicshelpers/submissioncontext_p.h
src/plugins/renderers/opengl/renderer/renderer.cpp
src/render/backend/attachmentpack_p.h
src/render/frontend/qrenderaspect.cpp
src/render/picking/qabstractraycaster.cpp
tests/manual/manual.pro
Change-Id: I617b7e34bf7e11b2921bfc15e1b99c3e81891ec7
Diffstat (limited to 'src/animation')
| -rw-r--r-- | src/animation/frontend/qchannelmapper.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/animation/frontend/qchannelmapper.cpp b/src/animation/frontend/qchannelmapper.cpp index c5909adbc..aa88add1a 100644 --- a/src/animation/frontend/qchannelmapper.cpp +++ b/src/animation/frontend/qchannelmapper.cpp @@ -94,7 +94,8 @@ void QChannelMapper::removeMapping(QAbstractChannelMapping *mapping) { Q_ASSERT(mapping); Q_D(QChannelMapper); - d->m_mappings.removeOne(mapping); + if (!d->m_mappings.removeOne(mapping)) + return; d->updateNode(mapping, "mappings", Qt3DCore::PropertyValueRemoved); // Remove bookkeeping connection d->unregisterDestructionHelper(mapping); |