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/qmlscriptparser_p.h | |
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/qmlscriptparser_p.h')
-rw-r--r-- | src/declarative/qml/qmlscriptparser_p.h | 18 |
1 files changed, 13 insertions, 5 deletions
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; }; |