feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix regression caused by semantic check

Browse Source 
States can of course contain PropertyChanges.

Change-Id: Ie78be1db58c6820a49356b1cd70102e10211030b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Thomas Hartmann
2016-06-28 13:16:22 +02:00
parent 46840046df
commit 0a3f596599
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/qmljs/qmljscheck.cpp
View File

@@ -820,7 +820,8 @@ void Check::visitQmlObject(Node *ast, UiQualifiedId *typeId,
const QString typeName = getRightMostIdentifier(typeId)->name.toString(); 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); addMessage(StateCannotHaveChildItem, typeErrorLocation, typeName);
if (checkTypeForDesignerSupport(typeId)) if (checkTypeForDesignerSupport(typeId))