summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlcompiler.cpp
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-09-10 00:19:33 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-09-10 00:19:33 (GMT)
commita250db23c96fc1ec47ea4d19d62a19cad7c50b46 (patch)
tree640237f325d4a734ecc42c042812a497c7a1f190 /src/declarative/qml/qmlcompiler.cpp
parentd3bd0567fbc16263fcb181d58529e6d7aeee1bbd (diff)
downloadQt-a250db23c96fc1ec47ea4d19d62a19cad7c50b46.zip
Qt-a250db23c96fc1ec47ea4d19d62a19cad7c50b46.tar.gz
Qt-a250db23c96fc1ec47ea4d19d62a19cad7c50b46.tar.bz2
Report custom parse errors verbosely.
Diffstat (limited to 'src/declarative/qml/qmlcompiler.cpp')
-rw-r--r--src/declarative/qml/qmlcompiler.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index b8e9d47..f02dad5 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -761,12 +761,13 @@ bool QmlCompiler::buildObject(Object *obj, const BindingContext &ctxt)
// Compile custom parser parts
if (isCustomParser && !customProps.isEmpty()) {
- // ### Check for failure
- bool ok = false;
QmlCustomParser *cp = output->types.at(obj->type).type->customParser();
- obj->custom = cp->compile(customProps, &ok);
- if(!ok)
- COMPILE_EXCEPTION(obj, "Failure compiling custom type");
+ cp->clearErrors();
+ obj->custom = cp->compile(customProps);
+ foreach (QmlError err, cp->errors()) {
+ err.setUrl(output->url);
+ exceptions << err;
+ }
}
return true;