diff options
| -rw-r--r-- | src/declarative/qml/qmlscriptparser.cpp | 10 | ||||
| -rw-r--r-- | tools/qmlconv/qmlconv.cpp | 8 |
2 files changed, 14 insertions, 4 deletions
diff --git a/src/declarative/qml/qmlscriptparser.cpp b/src/declarative/qml/qmlscriptparser.cpp index 22169a5..03e6165 100644 --- a/src/declarative/qml/qmlscriptparser.cpp +++ b/src/declarative/qml/qmlscriptparser.cpp @@ -397,6 +397,16 @@ Object *ProcessAST::defineObjectBinding(int line, } return 0; + } else if(!currentProperty() && objectType == QLatin1String("State")) { + _stateStack.pushProperty(QLatin1String("states"), line); + Object *obj = defineObjectBinding_helper(line, 0, objectType, initializer); + _stateStack.pop(); + return obj; + } else if (!currentProperty() && objectType == QLatin1String("Transition")) { + _stateStack.pushProperty(QLatin1String("transitions"), line); + Object *obj = defineObjectBinding_helper(line, 0, objectType, initializer); + _stateStack.pop(); + return obj; } return defineObjectBinding_helper(line, qualifiedId, objectType, initializer); diff --git a/tools/qmlconv/qmlconv.cpp b/tools/qmlconv/qmlconv.cpp index 6448414..f18ac75 100644 --- a/tools/qmlconv/qmlconv.cpp +++ b/tools/qmlconv/qmlconv.cpp @@ -88,10 +88,10 @@ public: startDeclareProperties(); else if (xml.name() == "signals") startDeclareSignals(); -// else if (xml.name() == "states") -// loop(); // ignore -// else if (xml.name() == "transitions") -// loop(); // ignore + else if (xml.name() == "states") + loop(); // ignore + else if (xml.name() == "transitions") + loop(); // ignore else if (knownListProperties.contains(xml.name().toString())) startList(); else if (xml.name() == "SetProperties") |