diff options
author | Martin Jones <martin.jones@nokia.com> | 2009-05-10 23:13:00 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2009-05-10 23:13:00 (GMT) |
commit | 84c3cdd69b6f7fec4cb30563661fcbd4386f29a2 (patch) | |
tree | f2b92e9f696568dee99201ea21dfa9ae3ffc7694 /src/declarative/qml | |
parent | 78939175e77f85025b04524846d2acfce619f21c (diff) | |
parent | b0aa85acee7e9e332d3811b054c914c4ec3fafce (diff) | |
download | Qt-84c3cdd69b6f7fec4cb30563661fcbd4386f29a2.zip Qt-84c3cdd69b6f7fec4cb30563661fcbd4386f29a2.tar.gz Qt-84c3cdd69b6f7fec4cb30563661fcbd4386f29a2.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml')
-rw-r--r-- | src/declarative/qml/qmldom.cpp | 17 | ||||
-rw-r--r-- | src/declarative/qml/qmldom.h | 3 | ||||
-rw-r--r-- | src/declarative/qml/qmldom_p.h | 3 | ||||
-rw-r--r-- | src/declarative/qml/qmlscriptparser.cpp | 24 | ||||
-rw-r--r-- | src/declarative/qml/qmlscriptparser_p.h | 18 |
5 files changed, 54 insertions, 11 deletions
diff --git a/src/declarative/qml/qmldom.cpp b/src/declarative/qml/qmldom.cpp index a31be81..4e754a3 100644 --- a/src/declarative/qml/qmldom.cpp +++ b/src/declarative/qml/qmldom.cpp @@ -143,7 +143,15 @@ int QmlDomDocument::version() const } /*! - Loads a QmlDomDocument from \a data. \a data should be valid QML XML + Return the URIs listed by "import <dir>" in the qml. +*/ +QList<QUrl> QmlDomDocument::imports() const +{ + return d->imports; +} + +/*! + Loads a QmlDomDocument from \a data. \a data should be valid QML data. On success, true is returned. If the \a data is malformed, false is returned and QmlDomDocument::loadError() contains an error description. @@ -153,11 +161,12 @@ bool QmlDomDocument::load(QmlEngine *engine, const QByteArray &data, const QUrl { Q_UNUSED(engine); d->errors.clear(); + d->imports.clear(); QmlCompiledComponent component; QmlCompiler compiler; - QmlCompositeTypeData *td = ((QmlEnginePrivate *)QmlEnginePrivate::get(engine))->typeManager.getImmediate(data, url);; + QmlCompositeTypeData *td = ((QmlEnginePrivate *)QmlEnginePrivate::get(engine))->typeManager.getImmediate(data, url); if(td->status == QmlCompositeTypeData::Error) { d->errors = td->errors; @@ -179,6 +188,10 @@ bool QmlDomDocument::load(QmlEngine *engine, const QByteArray &data, const QUrl return false; } + for (int i = 0; i < td->data.imports().size(); ++i) { + d->imports += QUrl(td->data.imports().at(i).uri); + } + if (td->data.tree()) { td->data.tree()->dump(); d->root = td->data.tree(); diff --git a/src/declarative/qml/qmldom.h b/src/declarative/qml/qmldom.h index f90fb08..8b503fa 100644 --- a/src/declarative/qml/qmldom.h +++ b/src/declarative/qml/qmldom.h @@ -71,7 +71,8 @@ public: QmlDomDocument &operator=(const QmlDomDocument &); int version() const; - + QList<QUrl> imports() const; + QList<QmlError> errors() const; bool load(QmlEngine *, const QByteArray &, const QUrl & = QUrl()); QByteArray save() const; diff --git a/src/declarative/qml/qmldom_p.h b/src/declarative/qml/qmldom_p.h index 4c3ca44..74edd47 100644 --- a/src/declarative/qml/qmldom_p.h +++ b/src/declarative/qml/qmldom_p.h @@ -42,6 +42,8 @@ #ifndef QMLDOM_P_H #define QMLDOM_P_H +#include <QtCore/QtGlobal> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -58,6 +60,7 @@ public: ~QmlDomDocumentPrivate(); QList<QmlError> errors; + QList<QUrl> imports; QmlParser::Object *root; }; diff --git a/src/declarative/qml/qmlscriptparser.cpp b/src/declarative/qml/qmlscriptparser.cpp index 4385601..0092ec2 100644 --- a/src/declarative/qml/qmlscriptparser.cpp +++ b/src/declarative/qml/qmlscriptparser.cpp @@ -226,9 +226,12 @@ ProcessAST::defineObjectBinding_helper(int line, return 0; } - _stateStack.pushProperty(objectType, - this->location(propertyName)); - accept(initializer); + SourceLocation loc = typeLocation; + if (propertyName) + loc = location(propertyName); + + _stateStack.pushProperty(objectType, loc); + accept(initializer); _stateStack.pop(); return 0; @@ -362,6 +365,16 @@ bool ProcessAST::visit(AST::UiImport *node) { QString fileName = node->fileName->asString(); _parser->addNamespacePath(fileName); + + AST::SourceLocation startLoc = node->importToken; + AST::SourceLocation endLoc = node->semicolonToken; + + QmlScriptParser::Import import; + import.location = location(startLoc, endLoc); + import.uri = fileName; + + _parser->_imports << import; + return false; } @@ -686,6 +699,11 @@ Object *QmlScriptParser::tree() const return root; } +QList<QmlScriptParser::Import> QmlScriptParser::imports() const +{ + return _imports; +} + QList<QmlError> QmlScriptParser::errors() const { return _errors; diff --git a/src/declarative/qml/qmlscriptparser_p.h b/src/declarative/qml/qmlscriptparser_p.h index 4155bba..8a5466f 100644 --- a/src/declarative/qml/qmlscriptparser_p.h +++ b/src/declarative/qml/qmlscriptparser_p.h @@ -4,22 +4,28 @@ #include <QtCore/QList> #include <QtCore/QUrl> #include <QtDeclarative/qmlerror.h> -#include <qml.h> +#include "qmlparser_p.h" + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE QT_MODULE(Declarative) -namespace QmlParser { - class Object; -} - class QByteArray; class QmlScriptParser { public: + class Import + { + public: + Import() {} + + QString uri; + QmlParser::LocationSpan location; + }; + QmlScriptParser(); ~QmlScriptParser(); @@ -29,6 +35,7 @@ public: QStringList types() const; QmlParser::Object *tree() const; + QList<Import> imports() const; void clear(); @@ -48,6 +55,7 @@ public: QMap<QString,QString> _nameSpacePaths; QmlParser::Object *root; + QList<Import> _imports; QStringList _typeNames; QString _scriptFile; }; |