Merge remote-tracking branch 'origin/5.0' into 6.0

Change-Id: Ibcf3ada2824dbbaae8aed0903af61bc95c1c7ce7
2021-10-20 12:19:31 +02:00
parent 19119b9533 3cde937ea1
commit 89d37fb65b
22 changed files with 61 additions and 1 deletions
--- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
@@ -1505,6 +1505,8 @@ QVariant NodeMetaInfo::propertyCastedValue(const PropertyName &propertyName, con
        return variant.toFloat();
    } else if (typeName == "<cpp>.int") {
        return variant.toInt();
+    } else if (typeName == "<cpp>.bool") {
+        return variant.toBool();
    } else if (copyVariant.convert(typeId)) {
        return copyVariant;
    }