diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2012-04-10 18:11:30 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-04 13:15:01 +0200 |
commit | 6f3bda0dce945a5fc75d8ebad302820fe9979d9b (patch) | |
tree | 6581aad8a7fb21ccbebe09d23c30af0e3236e266 /src/qml/qml/qqmlscript_p.h | |
parent | 44f9412bf789d73dd462292038686f5b07026132 (diff) |
Initial bundle support
Change-Id: I095249f64ecf4ef1e3fbfb164e3d50edffab61e8
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'src/qml/qml/qqmlscript_p.h')
-rw-r--r-- | src/qml/qml/qqmlscript_p.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/qml/qml/qqmlscript_p.h b/src/qml/qml/qqmlscript_p.h index 8705f2aef9..1e46e6b655 100644 --- a/src/qml/qml/qqmlscript_p.h +++ b/src/qml/qml/qqmlscript_p.h @@ -109,16 +109,16 @@ struct LocationSpan class Import { public: - Import() : type(Library) {} + Import() : type(Library), majorVersion(-1), minorVersion(-1) {} enum Type { Library, File, Script }; Type type; QString uri; QString qualifier; - QString version; - void extractVersion(int *maj, int *min) const; + int majorVersion; + int minorVersion; QQmlScript::LocationSpan location; }; @@ -469,14 +469,16 @@ public: }; class ParserJsASTData; -class Q_AUTOTEST_EXPORT Parser +class Q_QML_EXPORT Parser { public: Parser(); ~Parser(); - bool parse(const QByteArray &data, const QUrl &url = QUrl(), - const QString &urlString = QString()); + bool parse(const QString &data, const QByteArray &preparseData, + const QUrl &url = QUrl(), const QString &urlString = QString()); + + QByteArray preparseData() const; QList<TypeReference*> referencedTypes() const; |