whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Jędrzej Nowacki 2014-08-12 11:23:25 +02:00
parent b9d0116356
commit 8f8c7e8a2b
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/corelib/kernel/qmetaobject.cpp
View File

@ -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;