diff options
| author | Ian Walters <ian.walters@nokia.com> | 2009-05-05 02:11:36 (GMT) |
|---|---|---|
| committer | Ian Walters <ian.walters@nokia.com> | 2009-05-05 02:11:36 (GMT) |
| commit | d0b37af9b27849278fd56a83635c141525a912ce (patch) | |
| tree | 2c0c2c149d686b52c339a5b2135fde35659d7648 /src/declarative/qml/qmlcomponent.h | |
| parent | 28b3eb37f7647450ccbac1365a06ffc6ba6a8584 (diff) | |
| parent | 84b619c1e8556c3e7ca79d799dfa705b63523370 (diff) | |
| download | Qt-d0b37af9b27849278fd56a83635c141525a912ce.zip Qt-d0b37af9b27849278fd56a83635c141525a912ce.tar.gz Qt-d0b37af9b27849278fd56a83635c141525a912ce.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
doc/src/tutorials/declarative.qdoc
Diffstat (limited to 'src/declarative/qml/qmlcomponent.h')
| -rw-r--r-- | src/declarative/qml/qmlcomponent.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/declarative/qml/qmlcomponent.h b/src/declarative/qml/qmlcomponent.h index 83d08ea..90f7467 100644 --- a/src/declarative/qml/qmlcomponent.h +++ b/src/declarative/qml/qmlcomponent.h @@ -46,7 +46,7 @@ #include <QtCore/qstring.h> #include <QtDeclarative/qfxglobal.h> #include <QtDeclarative/qml.h> - +#include <QtDeclarative/qmlerror.h> QT_BEGIN_HEADER @@ -77,7 +77,8 @@ public: bool isReady() const; bool isError() const; bool isLoading() const; - QString errorDescription() const; + + QList<QmlError> errors() const; QUrl url() const; @@ -98,7 +99,7 @@ private: QmlComponent(QmlEngine *, QmlCompiledComponent *, int, int, QObject *parent); friend class QmlVME; - friend class QmlCompositeTypeData; + friend struct QmlCompositeTypeData; }; QML_DECLARE_TYPE(QmlComponent); |