diff options
4 files changed, 7 insertions, 7 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qmlprivategate/metaobject.cpp b/share/qtcreator/qml/qmlpuppet/qmlprivategate/metaobject.cpp index 0b887fa027..08caa70368 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlprivategate/metaobject.cpp +++ b/share/qtcreator/qml/qmlpuppet/qmlprivategate/metaobject.cpp @@ -304,9 +304,9 @@ int MetaObject::metaCall(QMetaObject::Call call, int id, void **a) && property(id).name() == QLatin1String("parent"))) { QObject *contextDummyObject = objectNodeInstance->nodeInstanceServer()->dummyContextObject(); - int properyIndex = contextDummyObject->metaObject()->indexOfProperty(propertyById.name()); - if (properyIndex >= 0) - metaCallReturnValue = contextDummyObject->qt_metacall(call, properyIndex, a); + int propertyIndex = contextDummyObject->metaObject()->indexOfProperty(propertyById.name()); + if (propertyIndex >= 0) + metaCallReturnValue = contextDummyObject->qt_metacall(call, propertyIndex, a); } } */ 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; diff --git a/tests/auto/qml/codemodel/importscheck/005_compositeQmlCopyAndCpp/QtQuick/Controls/SplitView.qml b/tests/auto/qml/codemodel/importscheck/005_compositeQmlCopyAndCpp/QtQuick/Controls/SplitView.qml index 2e2ca6a7bf..e792762e7c 100644 --- a/tests/auto/qml/codemodel/importscheck/005_compositeQmlCopyAndCpp/QtQuick/Controls/SplitView.qml +++ b/tests/auto/qml/codemodel/importscheck/005_compositeQmlCopyAndCpp/QtQuick/Controls/SplitView.qml @@ -157,7 +157,7 @@ Item { } /*! - This propery is \c true when the user is resizing any of the items by + This property is \c true when the user is resizing any of the items by dragging on the splitter handles. */ property bool resizing: false diff --git a/tests/auto/qml/codemodel/importscheck/007_compositeQmlCopyAndCppAndQml/QtQuick/Controls/SplitView.qml b/tests/auto/qml/codemodel/importscheck/007_compositeQmlCopyAndCppAndQml/QtQuick/Controls/SplitView.qml index 2e2ca6a7bf..e792762e7c 100644 --- a/tests/auto/qml/codemodel/importscheck/007_compositeQmlCopyAndCppAndQml/QtQuick/Controls/SplitView.qml +++ b/tests/auto/qml/codemodel/importscheck/007_compositeQmlCopyAndCppAndQml/QtQuick/Controls/SplitView.qml @@ -157,7 +157,7 @@ Item { } /*! - This propery is \c true when the user is resizing any of the items by + This property is \c true when the user is resizing any of the items by dragging on the splitter handles. */ property bool resizing: false |