aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@digia.com>2014-08-05 14:55:51 +0200
committerTim Jenssen <tim.jenssen@digia.com>2014-08-05 16:30:47 +0200
commitb7dbbc6ef0b14c7108fd32730e61d8f9e7a89d8e (patch)
tree74d5355bcc6228ad346dc7192ce31ee6bc224241 /share
parentbbc9005afa04402b6e6343cbc0f9f31e8ca8642e (diff)
QmlDesigner: fix crash on mac
Came from two deletions at the same time QCache::remove and delete on sharedMemory.QmlDesigner: Change-Id: I6a29cf160c8e81ecd955cf36999edc639fbbb63f Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Diffstat (limited to 'share')
-rw-r--r--share/qtcreator/qml/qmlpuppet/container/imagecontainer.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/container/imagecontainer.cpp b/share/qtcreator/qml/qmlpuppet/container/imagecontainer.cpp
index 87505ca458..497bb57d07 100644
--- a/share/qtcreator/qml/qmlpuppet/container/imagecontainer.cpp
+++ b/share/qtcreator/qml/qmlpuppet/container/imagecontainer.cpp
@@ -121,7 +121,6 @@ static SharedMemory *createSharedMemory(qint32 key, int byteCount)
if (!sharedMemory->isAttached()) {
globalSharedMemoryContainer()->remove(key);
- delete sharedMemory;
sharedMemory = 0;
}
}