diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@digia.com> | 2014-08-12 11:23:25 +0200 |
|---|---|---|
| committer | Jędrzej Nowacki <jedrzej.nowacki@digia.com> | 2014-08-14 09:23:25 +0200 |
| commit | 8f8c7e8a2b041b29ce31386bdf336f7db7e26dd2 (patch) | |
| tree | cc944339cf2308ae0f0a159b035c932fe7878b12 /src/corelib/kernel/qmetaobject.cpp | |
| parent | b9d01163565a8cb4e5cfd86810f726ef48eee182 (diff) | |
Remove redundant code from QMetaProperty.
The code contained old Qt4 logic. There is no point in checking values
of QVariant as they are in sync with QMetaType.
Change-Id: I58ace52f69939488e6ea7e7bab98df38419420a8
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/kernel/qmetaobject.cpp')
| -rw-r--r-- | src/corelib/kernel/qmetaobject.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index cb63718680..dcebe0b00a 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -2920,15 +2920,7 @@ bool QMetaProperty::write(QObject *object, const QVariant &value) const typeName = rawStringData(mobj, typeInfo & TypeNameIndexMask); t = QMetaType::type(typeName); } - if (t == QMetaType::UnknownType) { - Q_ASSERT(typeName != 0); - const char *vtypeName = value.typeName(); - if (vtypeName && strcmp(typeName, vtypeName) == 0) - t = value.userType(); - else - t = QVariant::nameToType(typeName); - } - if (t == QVariant::Invalid) + if (t == QMetaType::UnknownType) return false; if (t != QMetaType::QVariant && t != (uint)value.userType() && (t < QMetaType::User && !v.convert((QVariant::Type)t))) return false; |