Merge remote-tracking branch 'origin/5.9' into dev

Change-Id: I92b13a9c1727644d63e125c1e6f1fdac72720ad7

1 files changed, 3 insertions, 1 deletions

diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp
index 8dda682ce8..d262b230e2 100644
--- a/src/qml/qml/qqmlvaluetypewrapper.cpp
+++ b/src/qml/qml/qqmlvaluetypewrapper.cpp
@@ -290,9 +290,11 @@ int QQmlValueTypeWrapper::typeId() const
 bool QQmlValueTypeWrapper::write(QObject *target, int propertyIndex) const
 {
     bool destructGadgetOnExit = false;
+    Q_ALLOCA_DECLARE(void, gadget);
     if (const QQmlValueTypeReference *ref = as<const QQmlValueTypeReference>()) {
         if (!d()->gadgetPtr) {
-            d()->gadgetPtr = alloca(d()->valueType->metaType.sizeOf());
+            Q_ALLOCA_ASSIGN(void, gadget, d()->valueType->metaType.sizeOf());
+            d()->gadgetPtr = gadget;
             d()->valueType->metaType.construct(d()->gadgetPtr, 0);
             destructGadgetOnExit = true;
         }