aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2020-03-24 18:24:42 +0100
committerUlf Hermann <ulf.hermann@qt.io>2020-03-24 19:05:05 +0100
commit581250ff9e7056b568aa199d17d140e3dbc32223 (patch)
tree7e1cb10de6f44920d4c23af3d3a6ec0f1d256e57 /src
parent1a1028a1e4ca3d0d932141f265d01284e013a76a (diff)
Fix typo: inlineComponendId -> inlineComponentId
Change-Id: Ic0c768fc2402d8674e06e84dfe4dc90d05407167 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/qml/jsruntime/qv4executablecompilationunit.cpp4
-rw-r--r--src/qml/qml/qqmlobjectcreator.cpp2
-rw-r--r--src/qml/qml/qqmlpropertycachecreator_p.h2
-rw-r--r--src/qml/qml/qqmltype.cpp4
-rw-r--r--src/qml/qml/qqmltype_p.h2
-rw-r--r--src/qml/qml/qqmltypedata.cpp4
6 files changed, 9 insertions, 9 deletions
diff --git a/src/qml/jsruntime/qv4executablecompilationunit.cpp b/src/qml/jsruntime/qv4executablecompilationunit.cpp
index 962b23fad6..fb19ac4b66 100644
--- a/src/qml/jsruntime/qv4executablecompilationunit.cpp
+++ b/src/qml/jsruntime/qv4executablecompilationunit.cpp
@@ -458,7 +458,7 @@ void ExecutableCompilationUnit::finalizeCompositeType(QQmlEnginePrivate *qmlEngi
// This requires that inline components are visited in the correct order
auto icRoot = typeRef->compilationUnit->icRoot;
if (typeRef->type.isInlineComponentType()) {
- icRoot = typeRef->type.inlineComponendId();
+ icRoot = typeRef->type.inlineComponentId();
}
QScopedValueRollback<int> rollback {typeRef->compilationUnit->icRoot, icRoot};
inlineComponentData[lastICRoot].totalBindingCount += typeRef->compilationUnit->totalBindingsCount();
@@ -484,7 +484,7 @@ void ExecutableCompilationUnit::finalizeCompositeType(QQmlEnginePrivate *qmlEngi
if (typeRef->compilationUnit) {
auto icRoot = typeRef->compilationUnit->icRoot;
if (typeRef->type.isInlineComponentType()) {
- icRoot = typeRef->type.inlineComponendId();
+ icRoot = typeRef->type.inlineComponentId();
}
QScopedValueRollback<int> rollback {typeRef->compilationUnit->icRoot, icRoot};
bindingCount += typeRef->compilationUnit->totalBindingsCount();
diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp
index 8f209311fa..d43b351a50 100644
--- a/src/qml/qml/qqmlobjectcreator.cpp
+++ b/src/qml/qml/qqmlobjectcreator.cpp
@@ -1245,7 +1245,7 @@ QObject *QQmlObjectCreator::createInstance(int index, QObject *parent, bool isCo
return nullptr;
}
} else {
- int subObjectId = type.inlineComponendId();
+ int subObjectId = type.inlineComponentId();
QScopedValueRollback<int> rollback {typeRef->compilationUnit->icRoot, subObjectId};
QQmlObjectCreator subCreator(context, typeRef->compilationUnit, sharedState.data());
instance = subCreator.create(subObjectId, nullptr, nullptr, CreationFlags::InlineComponent);
diff --git a/src/qml/qml/qqmlpropertycachecreator_p.h b/src/qml/qml/qqmlpropertycachecreator_p.h
index cadbfdd481..ad125b47e7 100644
--- a/src/qml/qml/qqmlpropertycachecreator_p.h
+++ b/src/qml/qml/qqmlpropertycachecreator_p.h
@@ -568,7 +568,7 @@ inline QQmlError QQmlPropertyCacheCreator<ObjectContainer>::createMetaObject(int
if (qmltype.isComposite() || qmltype.isInlineComponentType()) {
CompositeMetaTypeIds typeIds;
if (qmltype.isInlineComponentType()) {
- auto objectId = qmltype.inlineComponendId();
+ auto objectId = qmltype.inlineComponentId();
auto containingType = qmltype.containingType();
if (containingType.isValid()) {
auto icType = containingType.lookupInlineComponentById(objectId);
diff --git a/src/qml/qml/qqmltype.cpp b/src/qml/qml/qqmltype.cpp
index 5eb77b617d..586b078248 100644
--- a/src/qml/qml/qqmltype.cpp
+++ b/src/qml/qml/qqmltype.cpp
@@ -698,7 +698,7 @@ bool QQmlType::isInlineComponentType() const {
return d ? d->regType == QQmlType::InlineComponentType : false;
}
-int QQmlType::inlineComponendId() const {
+int QQmlType::inlineComponentId() const {
bool ok = false;
if (d->regType == QQmlType::RegistrationType::InlineComponentType) {
Q_ASSERT(d->extraData.id->objectId != -1);
@@ -713,7 +713,7 @@ QUrl QQmlType::sourceUrl() const
auto url = d ? d->sourceUrl() : QUrl();
if (url.isValid() && d->regType == QQmlType::RegistrationType::InlineComponentType && d->extraData.id->objectId) {
Q_ASSERT(url.hasFragment());
- url.setFragment(QString::number(inlineComponendId()));
+ url.setFragment(QString::number(inlineComponentId()));
}
return url;
}
diff --git a/src/qml/qml/qqmltype_p.h b/src/qml/qml/qqmltype_p.h
index 2b37ec16be..38f87b0092 100644
--- a/src/qml/qml/qqmltype_p.h
+++ b/src/qml/qml/qqmltype_p.h
@@ -146,7 +146,7 @@ public:
int index() const;
bool isInlineComponentType() const;
- int inlineComponendId() const;
+ int inlineComponentId() const;
struct Q_QML_PRIVATE_EXPORT SingletonInstanceInfo
{
diff --git a/src/qml/qml/qqmltypedata.cpp b/src/qml/qml/qqmltypedata.cpp
index 7b21edec37..943d483847 100644
--- a/src/qml/qml/qqmltypedata.cpp
+++ b/src/qml/qml/qqmltypedata.cpp
@@ -921,7 +921,7 @@ QQmlError QQmlTypeData::buildTypeResolutionCaches(
objectId = qmlType.containingType().lookupInlineComponentIdByName(QString::fromUtf8(qmlType.typeName()));
qmlType.setInlineComponentObjectId(objectId);
} else {
- objectId = resolvedType->type.inlineComponendId();
+ objectId = resolvedType->type.inlineComponentId();
}
Q_ASSERT(objectId != -1);
ref->typePropertyCache = resolvedType->typeData->compilationUnit()->propertyCaches.at(objectId);
@@ -934,7 +934,7 @@ QQmlError QQmlTypeData::buildTypeResolutionCaches(
ref->type = qmlType;
if (qmlType.isValid()) {
// this is required for inline components in singletons
- auto type = qmlType.lookupInlineComponentById(qmlType.inlineComponendId()).typeId();
+ auto type = qmlType.lookupInlineComponentById(qmlType.inlineComponentId()).typeId();
auto typeID = type.isValid() ? type.id() : -1;
auto exUnit = engine->obtainExecutableCompilationUnit(typeID);
if (exUnit) {