diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-03-05 03:23:04 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-03-05 03:24:38 (GMT) |
| commit | ae6f59d8dffc1a0569640e374dde01ed84f9c542 (patch) | |
| tree | 7e15d0ca912854c181bb0f1209ac29a00ad0228e /src/declarative/qml/qdeclarativecompiler.cpp | |
| parent | 604efbcd24058cdcb9bfa9691af6e08200eb47d4 (diff) | |
| download | Qt-ae6f59d8dffc1a0569640e374dde01ed84f9c542.zip Qt-ae6f59d8dffc1a0569640e374dde01ed84f9c542.tar.gz Qt-ae6f59d8dffc1a0569640e374dde01ed84f9c542.tar.bz2 | |
Allow unquoted enum syntax for value types
QTBUG-5424
Diffstat (limited to 'src/declarative/qml/qdeclarativecompiler.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativecompiler.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp index 5a2f3b5..3c6c949 100644 --- a/src/declarative/qml/qdeclarativecompiler.cpp +++ b/src/declarative/qml/qdeclarativecompiler.cpp @@ -561,9 +561,11 @@ bool QDeclarativeCompiler::compile(QDeclarativeEngine *engine, QDeclarativeCompositeTypeData::TypeReference &tref = unit->types[ii]; QDeclarativeCompiledData::TypeReference ref; QDeclarativeScriptParser::TypeReference *parserRef = unit->data.referencedTypes().at(ii); - if (tref.type) + if (tref.type) { ref.type = tref.type; - else if (tref.unit) { + if (!ref.type->isCreatable()) + COMPILE_EXCEPTION(parserRef->refObjects.first(), QCoreApplication::translate("QDeclarativeCompiler", "Element is not creatable.")); + } else if (tref.unit) { ref.component = tref.unit->toComponent(engine); if (ref.component->isError()) { |