diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-03 01:00:13 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-03 01:00:13 +0100 |
| commit | bf0603fd03ade413036c7dba1ffe0e7ac9364fc9 (patch) | |
| tree | b6329f629c5c0a19ca419671ee328725daec699f /src/qml/jsruntime/qv4engine.cpp | |
| parent | bb7a5d0cb6e62fa411e8b66759bf6b798c3f68d9 (diff) | |
| parent | 6b310e5f9a53c366fbb8fb78bd7c343aad4e0cdd (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I308b964d86ca01916f6af7d6e3f71557e3624eca
Diffstat (limited to 'src/qml/jsruntime/qv4engine.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4engine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index 9aac5c4f70..b697a2081b 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -920,7 +920,7 @@ void ExecutionEngine::requireArgumentsAccessors(int n) nArgumentsAccessors = qMax(8, n); argumentsAccessors = new Property[nArgumentsAccessors]; if (oldAccessors) { - memcpy(argumentsAccessors, oldAccessors, oldSize*sizeof(Property)); + memcpy(static_cast<void *>(argumentsAccessors), static_cast<const void *>(oldAccessors), oldSize*sizeof(Property)); delete [] oldAccessors; } ExecutionContext *global = rootContext(); |