From 8f8c7e8a2b041b29ce31386bdf336f7db7e26dd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Tue, 12 Aug 2014 11:23:25 +0200 Subject: [PATCH] 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 --- src/corelib/kernel/qmetaobject.cpp | 10 +--------- 1 file changed, 1 insertion(+), 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;