From 0a3f59659915f4c1cb974d20bb2ba3ff40cba79d Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 28 Jun 2016 13:16:22 +0200 Subject: [PATCH] QmlDesigner: Fix regression caused by semantic check States can of course contain PropertyChanges. Change-Id: Ie78be1db58c6820a49356b1cd70102e10211030b Reviewed-by: Christian Stenger --- src/libs/qmljs/qmljscheck.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp index 6756e7b2ed3..26b5b3ff19b 100644 --- a/src/libs/qmljs/qmljscheck.cpp +++ b/src/libs/qmljs/qmljscheck.cpp @@ -820,7 +820,8 @@ void Check::visitQmlObject(Node *ast, UiQualifiedId *typeId, const QString typeName = getRightMostIdentifier(typeId)->name.toString(); - if (!m_typeStack.isEmpty() && m_typeStack.last() == QLatin1String("State")) + if (!m_typeStack.isEmpty() && m_typeStack.last() == QLatin1String("State") + && typeId->name.toString() != "PropertyChanges") addMessage(StateCannotHaveChildItem, typeErrorLocation, typeName); if (checkTypeForDesignerSupport(typeId))