diff options
| author | Thomas Hartmann <Thomas.Hartmann@theqtcompany.com> | 2016-07-01 14:36:34 +0200 |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@theqtcompany.com> | 2016-07-01 15:29:32 +0000 |
| commit | 0db6f2a372f153f3f5403dd96f310b68d7b55de1 (patch) | |
| tree | d3b62a3a0db55c10d6aed0c60749c4fc75e1787f /src/libs/qmljs/qmljscheck.cpp | |
| parent | 31eae7bd3e8d34e3c59da9b8a1e1549f650485e3 (diff) | |
| download | qt-creator-0db6f2a372f153f3f5403dd96f310b68d7b55de1.tar.gz | |
QmlDesigner: A StateChangeScript can be the child of a State
I found this while testing our demos.
Change-Id: I575e1d2f487a2ba137ac8181f4980c30b171f726
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'src/libs/qmljs/qmljscheck.cpp')
| -rw-r--r-- | src/libs/qmljs/qmljscheck.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp index 26b5b3ff19..9610a95f72 100644 --- a/src/libs/qmljs/qmljscheck.cpp +++ b/src/libs/qmljs/qmljscheck.cpp @@ -821,7 +821,8 @@ void Check::visitQmlObject(Node *ast, UiQualifiedId *typeId, const QString typeName = getRightMostIdentifier(typeId)->name.toString(); 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); if (checkTypeForDesignerSupport(typeId)) |