diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index 553929955d..7b78b96d09 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -2049,7 +2049,7 @@ bool QMetaType::convert(QMetaType fromType, const void *from, QMetaType toType, if (fromObject && fromObject->metaObject()->inherits(toType.metaObject())) { *static_cast<QObject **>(to) = toType.metaObject()->cast(fromObject); return true; - } else if (!fromObject) { + } else if (!fromObject && fromType.metaObject()) { // if fromObject is null, use static fromType to check if conversion works *static_cast<void **>(to) = nullptr; return fromType.metaObject()->inherits(toType.metaObject()); |