diff options
author | Frank Meerkoetter <frank.meerkoetter@basyskom.com> | 2015-07-30 22:54:17 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-08-18 20:26:30 +0000 |
commit | 214e987fb4f4a18d7c4a755d3d50ce72af603c9e (patch) | |
tree | 98ea51d9c652568c71296d65e67c5c7dc5d56743 | |
parent | bb3dc5116ef11d2be82757e623916e025bb03d76 (diff) |
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>
-rw-r--r-- | src/quick/util/qquickglobal.cpp | 10 |
1 files changed, 1 insertions, 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<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; } |