diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-07-04 13:49:03 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-07-05 16:31:09 +0200 |
| commit | 4ec66f1c4aa96ef919a0b902dd460f450170ce1b (patch) | |
| tree | dcc992736014232e946d4eb427ba82a2206cc77b /src/qml/qml/qqmlvmemetaobject.cpp | |
| parent | da7547080b83b4d2f2b6eb12e92afa3ff60ee295 (diff) | |
Clean up property type to meta-type mapping
Centralize the mapping in one place using a helper function. This
eliminates the table where the first field was unused as well.
Change-Id: I78b599d255e37931a02a8294b1df3d44023c9a15
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlvmemetaobject.cpp')
| -rw-r--r-- | src/qml/qml/qqmlvmemetaobject.cpp | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp index 2881e71805..b42e328e60 100644 --- a/src/qml/qml/qqmlvmemetaobject.cpp +++ b/src/qml/qml/qqmlvmemetaobject.cpp @@ -57,6 +57,7 @@ #include <private/qv4scopedvalue_p.h> #include <private/qv4jscall_p.h> #include <private/qv4qobjectwrapper_p.h> +#include <private/qqmlpropertycachecreator_p.h> QT_BEGIN_NAMESPACE @@ -656,35 +657,7 @@ int QQmlVMEMetaObject::metaCall(QObject *o, QMetaObject::Call c, int _id, void * } } else { - int fallbackMetaType = QMetaType::UnknownType; - switch (t) { - case QV4::CompiledData::Property::Font: - fallbackMetaType = QMetaType::QFont; - break; - case QV4::CompiledData::Property::Time: - fallbackMetaType = QMetaType::QTime; - break; - case QV4::CompiledData::Property::Color: - fallbackMetaType = QMetaType::QColor; - break; - case QV4::CompiledData::Property::Vector2D: - fallbackMetaType = QMetaType::QVector2D; - break; - case QV4::CompiledData::Property::Vector3D: - fallbackMetaType = QMetaType::QVector3D; - break; - case QV4::CompiledData::Property::Vector4D: - fallbackMetaType = QMetaType::QVector4D; - break; - case QV4::CompiledData::Property::Matrix4x4: - fallbackMetaType = QMetaType::QMatrix4x4; - break; - case QV4::CompiledData::Property::Quaternion: - fallbackMetaType = QMetaType::QQuaternion; - break; - default: break; - } - + const int fallbackMetaType = QQmlPropertyCacheCreatorBase::metaTypeForPropertyType(t); if (c == QMetaObject::ReadProperty) { switch (t) { |