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 <simon.hausmann@theqtcompany.com>

diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp
index cc908142aba516dc94866d36b263cb0aa05262ab..f9300545df9069888a737357b85a4a3b366f647e 100644 (file)
--- a/src/quick/util/qquickglobal.cpp
+++ b/src/quick/util/qquickglobal.cpp
@@ -506,15 +506,7 @@ public:
         case QMetaType::QQuaternion:
             return createFromStringTyped<QQuaternion>(data, dataSize, quaternionFromString(s, &ok));
         case QMetaType::QMatrix4x4:
-            {
-            if (dataSize >= sizeof(QMatrix4x4))
-                return createFromStringTyped<QMatrix4x4>(data, dataSize, matrix4x4FromString(s, &ok));
-
-            Q_ASSERT(dataSize >= sizeof(QVariant));
-            QVariant *matVar = reinterpret_cast<QVariant *>(data);
-            new (matVar) QVariant(matrix4x4FromString(s, &ok));
-            return true;
-            }
+            return createFromStringTyped<QMatrix4x4>(data, dataSize, matrix4x4FromString(s, &ok));
         default: break;
         }