diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-03-22 13:31:02 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-03-23 10:47:49 +0000 |
| commit | 2f9e30261f9d0c6d9dfe1675d93135cd659c4ef9 (patch) | |
| tree | 2f24617764a281629ee31e34891ea8f2ae2673a4 /src/lib/corelib | |
| parent | 6909d0dd1ce59d93071ce24ebd12c7c6436b93d1 (diff) | |
Use Item::hasOwnProperty where appropriate
Change-Id: I5a0108e4433f119d82e72b81e828ad0146a9ad74
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/lib/corelib')
| -rw-r--r-- | src/lib/corelib/language/itemreaderastvisitor.cpp | 2 | ||||
| -rw-r--r-- | src/lib/corelib/language/moduleloader.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/corelib/language/itemreaderastvisitor.cpp b/src/lib/corelib/language/itemreaderastvisitor.cpp index 53e309dde..fddb103f3 100644 --- a/src/lib/corelib/language/itemreaderastvisitor.cpp +++ b/src/lib/corelib/language/itemreaderastvisitor.cpp @@ -145,7 +145,7 @@ bool ItemReaderASTVisitor::visit(AST::UiObjectDefinition *ast) void ItemReaderASTVisitor::checkDuplicateBinding(Item *item, const QStringList &bindingName, const AST::SourceLocation &sourceLocation) { - if (Q_UNLIKELY(item->properties().contains(bindingName.last()))) { + if (Q_UNLIKELY(item->hasOwnProperty(bindingName.last()))) { QString msg = Tr::tr("Duplicate binding for '%1'"); throw ErrorInfo(msg.arg(bindingName.join(QLatin1Char('.'))), toCodeLocation(sourceLocation)); diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp index ef22f9782..f5ede7673 100644 --- a/src/lib/corelib/language/moduleloader.cpp +++ b/src/lib/corelib/language/moduleloader.cpp @@ -2359,7 +2359,7 @@ void ModuleLoader::copyProperties(const Item *sourceProject, Item *targetProject if (builtinProjectPropertyNames.contains(it.key())) continue; - if (targetProject->properties().contains(it.key())) + if (targetProject->hasOwnProperty(it.key())) continue; // Ignore stuff the target project already has. targetProject->setPropertyDeclaration(it.key(), it.value()); |