From 214e987fb4f4a18d7c4a755d3d50ce72af603c9e Mon Sep 17 00:00:00 2001 From: Frank Meerkoetter Date: Thu, 30 Jul 2015 22:54:17 +0200 Subject: Remove QQmlVMEVariant specific workaround A Q4x4Matrix wouldn't fit inside a QQmlVMEVariant. Therefore it was wrapped in a QVariant. Change-Id: I68864e456a4fd76143277d5a10d1a3f307e833f2 Reviewed-by: Simon Hausmann --- src/quick/util/qquickglobal.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp index cc908142ab..f9300545df 100644 --- a/src/quick/util/qquickglobal.cpp +++ b/src/quick/util/qquickglobal.cpp @@ -506,15 +506,7 @@ public: case QMetaType::QQuaternion: return createFromStringTyped(data, dataSize, quaternionFromString(s, &ok)); case QMetaType::QMatrix4x4: - { - if (dataSize >= sizeof(QMatrix4x4)) - return createFromStringTyped(data, dataSize, matrix4x4FromString(s, &ok)); - - Q_ASSERT(dataSize >= sizeof(QVariant)); - QVariant *matVar = reinterpret_cast(data); - new (matVar) QVariant(matrix4x4FromString(s, &ok)); - return true; - } + return createFromStringTyped(data, dataSize, matrix4x4FromString(s, &ok)); default: break; } -- cgit v1.2.3