Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 10:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

do not copy the variant before checking if it can be converted in QVariant::canConvert()

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-06-07 16:11:48 +03:00
parent 74fef30990
commit 4acfa93e66
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/core/kernel/qvariant.cpp
View file

@ -2669,19 +2669,22 @@ bool QVariant::convert(Type t)
if (d.type == int(t))
return true;
QVariant oldValue = *this;
if (!canConvert(t)) {
clear();
if (!oldValue.canConvert(t))
return false;
}
QVariant oldValue = *this;
clear();
create(t, nullptr);
if (oldValue.isNull())
if (oldValue.isNull()) {
return false;
}
bool isOk = true;
if (!handler->convert(&oldValue.d, t, data(), &isOk))
if (!handler->convert(&oldValue.d, t, data(), &isOk)) {
isOk = false;
}
d.is_null = !isOk;
return isOk;
}