diff options
author | Eike Ziller <eike.ziller@qt.io> | 2017-07-18 15:23:29 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2017-07-18 15:23:29 +0200 |
commit | 361fdad3be3421496be4dab014a8bee369687387 (patch) | |
tree | 4412737d90b20953064b8f53817c014ddc9714c3 /src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp | |
parent | 5e38bdbfd8bef6c3bdcede9fe0be11f34e9a0f7c (diff) | |
parent | 41ae823bda7cc1bad4b85861d9b0e3087c130e4a (diff) |
Merge remote-tracking branch 'origin/4.4'
Change-Id: I778acc044ac105a11054b314aecac5b1c2cfee6a
Diffstat (limited to 'src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp')
-rw-r--r-- | src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp index a95c455134..f5bb5d1ba6 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp @@ -1029,9 +1029,9 @@ bool NodeMetaInfoPrivate::cleverCheckType(const TypeName &otherType) const return typeName == convertedName.toUtf8(); } -QVariant::Type NodeMetaInfoPrivate::variantTypeId(const PropertyName &properyName) const +QVariant::Type NodeMetaInfoPrivate::variantTypeId(const PropertyName &propertyName) const { - TypeName typeName = propertyType(properyName); + TypeName typeName = propertyType(propertyName); if (typeName == "string") return QVariant::String; |