summaryrefslogtreecommitdiff
path: root/share/qtcreator
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@digia.com>2014-07-17 15:57:09 +0200
committerTim Jenssen <tim.jenssen@digia.com>2014-07-22 11:27:42 +0200
commit38e61ea5521978920fa56557fb36dfb49323d1b9 (patch)
tree1b5eb0ba1d95bc48d1f062be011d3a951212d24b /share/qtcreator
parent9898ac50e10f427f0950a19bcd43417722f0df81 (diff)
downloadqt-creator-38e61ea5521978920fa56557fb36dfb49323d1b9.tar.gz
QmlDesigner: even read methods need a lock
Change-Id: I7381d4c236be59ddd2015b83e9d5eb90e2cb2006 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Diffstat (limited to 'share/qtcreator')
-rw-r--r--share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp
index 636074074e..cb7a316426 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp
@@ -112,7 +112,9 @@ QDataStream &operator<<(QDataStream &out, const ValuesChangedCommand &command)
QSharedMemory *sharedMemory = createSharedMemory(keyCounter, outDataStreamByteArray.size());
if (sharedMemory) {
+ sharedMemory->lock();
std::memcpy(sharedMemory->data(), outDataStreamByteArray.constData(), sharedMemory->size());
+ sharedMemory->unlock();
out << command.keyNumber();
return out;
}