diff options
author | Frank Meerkoetter <frank.meerkoetter@basyskom.com> | 2015-07-30 22:48:58 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-08-19 12:25:40 +0000 |
commit | fe349cd5dda4fb8178240dbdb50f915b7d21033e (patch) | |
tree | 7e03b2b404fd611fb281b838cb20f05bdf76b35f /src/quick3d/quick3d | |
parent | ef09640fb0ba358f17fda7b8f572f5e1e0239381 (diff) |
Remove QQmlVMEVariant specific workaround
A Q4x4Matrix wouldn't fit inside a QQmlVMEVariant. Therefore it was
wrapped in a QVariant.
Change-Id: Icfce931dac222c03855ba2d80c70631130d657c4
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/quick3d/quick3d')
-rw-r--r-- | src/quick3d/quick3d/qt3dquick_global.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/quick3d/quick3d/qt3dquick_global.cpp b/src/quick3d/quick3d/qt3dquick_global.cpp index 139601832..dc1125333 100644 --- a/src/quick3d/quick3d/qt3dquick_global.cpp +++ b/src/quick3d/quick3d/qt3dquick_global.cpp @@ -500,15 +500,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; } |