diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-03-22 16:11:52 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-03-29 12:53:46 +0000 |
| commit | 688552ac738ccf406a9f3c2b673e70ae5bf6b8ca (patch) | |
| tree | a15c6397b1483aaa514f6bb0e66ffa6d0dd13ce3 /src/lib/corelib | |
| parent | 5742084945434d94488a3cc98cfaa02fcfec7420 (diff) | |
Remove PropertyDeclaration::ListProperty flag
This was never used, and the check was wrong such that every property
that did *not* have the list<> type modifier was flagged.
[ChangeLog] Properties with the list<> type modifier are not silently
ignored anymore but yield an error.
Change-Id: I6453f9f178f61fe6b0303d35f80e4fa8f14cb729
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/lib/corelib')
| -rw-r--r-- | src/lib/corelib/language/itemreaderastvisitor.cpp | 4 | ||||
| -rw-r--r-- | src/lib/corelib/language/propertydeclaration.h | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/corelib/language/itemreaderastvisitor.cpp b/src/lib/corelib/language/itemreaderastvisitor.cpp index b9d62492f..1c14534ff 100644 --- a/src/lib/corelib/language/itemreaderastvisitor.cpp +++ b/src/lib/corelib/language/itemreaderastvisitor.cpp @@ -167,9 +167,7 @@ bool ItemReaderASTVisitor::visit(AST::UiPublicMember *ast) throw ErrorInfo(Tr::tr("Unknown type '%1' in property declaration.") .arg(ast->memberType.toString()), toCodeLocation(ast->typeToken)); } - if (ast->typeModifier.compare(QLatin1String("list"))) { - p.setFlags(p.flags() | PropertyDeclaration::ListProperty); - } else if (Q_UNLIKELY(!ast->typeModifier.isEmpty())) { + if (Q_UNLIKELY(!ast->typeModifier.isEmpty())) { throw ErrorInfo(Tr::tr("public member with type modifier '%1' not supported").arg( ast->typeModifier.toString())); } diff --git a/src/lib/corelib/language/propertydeclaration.h b/src/lib/corelib/language/propertydeclaration.h index 13db33838..7d5634b3c 100644 --- a/src/lib/corelib/language/propertydeclaration.h +++ b/src/lib/corelib/language/propertydeclaration.h @@ -70,7 +70,6 @@ public: enum Flag { DefaultFlags = 0, - ListProperty = 0x1, PropertyNotAvailableInConfig = 0x2 // Is this property part of a project, product or file configuration? }; Q_DECLARE_FLAGS(Flags, Flag) |