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

QmlDesigner: A StateChangeScript can be the child of a State

Browse Source 
I found this while testing our demos.

Change-Id: I575e1d2f487a2ba137ac8181f4980c30b171f726
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Thomas Hartmann
2016-07-01 14:36:34 +02:00
parent 31eae7bd3e
commit 0db6f2a372
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

@@ -821,7 +821,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") && typeId->name.toString() != "PropertyChanges"
&& typeId->name.toString() != "StateChangeScript")
addMessage(StateCannotHaveChildItem, typeErrorLocation, typeName); addMessage(StateCannotHaveChildItem, typeErrorLocation, typeName);
if (checkTypeForDesignerSupport(typeId)) if (checkTypeForDesignerSupport(typeId))