aboutsummaryrefslogtreecommitdiffstats
path: root/src/qmldebug
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-03-03 01:00:13 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-03-03 01:00:13 +0100
commitbf0603fd03ade413036c7dba1ffe0e7ac9364fc9 (patch)
treeb6329f629c5c0a19ca419671ee328725daec699f /src/qmldebug
parentbb7a5d0cb6e62fa411e8b66759bf6b798c3f68d9 (diff)
parent6b310e5f9a53c366fbb8fb78bd7c343aad4e0cdd (diff)
Merge remote-tracking branch 'origin/5.11' into dev
Diffstat (limited to 'src/qmldebug')
-rw-r--r--src/qmldebug/qqmlprofilerevent_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h
index 93562302e9..49a0c9e347 100644
--- a/src/qmldebug/qqmlprofilerevent_p.h
+++ b/src/qmldebug/qqmlprofilerevent_p.h
@@ -97,7 +97,7 @@ struct QQmlProfilerEvent : public QQmlProfilerDefinitions {
QQmlProfilerEvent(QQmlProfilerEvent &&other)
{
- memcpy(this, &other, sizeof(QQmlProfilerEvent));
+ memcpy(static_cast<void *>(this), static_cast<const void *>(&other), sizeof(QQmlProfilerEvent));
other.m_dataType = Inline8Bit; // prevent dtor from deleting the pointer
}
@@ -117,7 +117,7 @@ struct QQmlProfilerEvent : public QQmlProfilerDefinitions {
QQmlProfilerEvent &operator=(QQmlProfilerEvent &&other)
{
if (this != &other) {
- memcpy(this, &other, sizeof(QQmlProfilerEvent));
+ memcpy(static_cast<void *>(this), static_cast<const void *>(&other), sizeof(QQmlProfilerEvent));
other.m_dataType = Inline8Bit;
}
return *this;