1 files changed, 18 insertions, 7 deletions

diff --git a/src/declarative/qml/qmldom.cpp b/src/declarative/qml/qmldom.cpp
index 5380740..08755b1 100644
--- a/src/declarative/qml/qmldom.cpp
+++ b/src/declarative/qml/qmldom.cpp
@@ -70,6 +70,7 @@ QmlDomDocumentPrivate::~QmlDomDocumentPrivate()
 
 /*!
     \class QmlDomDocument
+    \internal
     \brief The QmlDomDocument class represents the root of a QML document
 
     A QML document is a self-contained snippet of QML, usually contained in a
@@ -152,7 +153,7 @@ bool QmlDomDocument::load(QmlEngine *engine, const QByteArray &data)
 {
     Q_UNUSED(engine);
 
-    d->error = QString();
+    d->errors.clear();
 
     QmlCompiledComponent component;
     QmlCompiler compiler;
@@ -160,11 +161,13 @@ bool QmlDomDocument::load(QmlEngine *engine, const QByteArray &data)
     QmlCompositeTypeData *td = ((QmlEnginePrivate *)QmlEnginePrivate::get(engine))->typeManager.getImmediate(data, QUrl());;
 
     if(td->status == QmlCompositeTypeData::Error) {
-        d->error = td->errorDescription;
+        d->errors = td->errors;
         td->release();
         return false;
     } else if(td->status == QmlCompositeTypeData::Waiting) {
-        d->error = QLatin1String("QmlDomDocument supports local types only");
+        QmlError error;
+        error.setDescription(QLatin1String("QmlDomDocument supports local types only"));
+        d->errors << error;
         td->release();
         return false;
     } 
@@ -172,7 +175,7 @@ bool QmlDomDocument::load(QmlEngine *engine, const QByteArray &data)
     compiler.compile(engine, td, &component);
 
     if (compiler.isError()) {
-        d->error = compiler.errorDescription();
+        d->errors = compiler.errors();
         td->release();
         return false;
     }
@@ -188,14 +191,14 @@ bool QmlDomDocument::load(QmlEngine *engine, const QByteArray &data)
 
 
 /*!
-    Returns the last load error.  The load error will be reset after a 
+    Returns the last load errors.  The load errors will be reset after a 
     successful call to load().
 
     \sa load()
 */
-QString QmlDomDocument::loadError() const
+QList<QmlError> QmlDomDocument::errors() const
 {
-    return d->error;
+    return d->errors;
 }
 
 /*!
@@ -249,6 +252,7 @@ QmlDomPropertyPrivate::~QmlDomPropertyPrivate()
 
 /*!
     \class QmlDomProperty
+    \internal
     \brief The QmlDomProperty class represents one property assignment in the 
     QML DOM tree
 
@@ -450,6 +454,7 @@ QmlDomObjectPrivate::properties(QmlParser::Property *property) const
 
 /*!
     \class QmlDomObject
+    \internal
     \brief The QmlDomObject class represents an object instantiation.
 
     Each object instantiated in a QML file has a corresponding QmlDomObject
@@ -734,6 +739,7 @@ QmlDomBasicValuePrivate::~QmlDomBasicValuePrivate()
 
 /*!
     \class QmlDomValueLiteral
+    \internal
     \brief The QmlDomValueLiteral class represents a literal value.
 
     A literal value is a simple value, written inline with the QML.  In the
@@ -806,6 +812,7 @@ void QmlDomValueLiteral::setLiteral(const QString &value)
 
 /*!
     \class QmlDomValueBinding
+    \internal
     \brief The QmlDomValueBinding class represents a property binding.
 
     A property binding is an ECMAScript expression assigned to a property.  In
@@ -875,6 +882,7 @@ void QmlDomValueBinding::setBinding(const QString &expression)
 
 /*!
     \class QmlDomValueValueSource
+    \internal
     \brief The QmlDomValueValueSource class represents a value source assignment value.
 
     In QML, value sources are special value generating types that may be 
@@ -983,6 +991,7 @@ QmlDomValuePrivate::~QmlDomValuePrivate()
 
 /*!
     \class QmlDomValue
+    \internal
     \brief The QmlDomValue class represents a generic Qml value.
 
     QmlDomValue's can be assigned to QML \l {QmlDomProperty}{properties}.  In 
@@ -1234,6 +1243,7 @@ QmlDomList QmlDomValue::toList() const
 
 /*!
     \class QmlDomList
+    \internal
     \brief The QmlDomList class represents a list of values assigned to a QML property.
 
     Lists of values can be assigned to properties.  For example, the following
@@ -1323,6 +1333,7 @@ void QmlDomList::setValues(const QList<QmlDomValue> &values)
 
 /*!
     \class QmlDomComponent
+    \internal
     \brief The QmlDomComponent class represents sub-component within a QML document.
 
     Sub-components are QmlComponents defined within a QML document.  The