diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativescriptparser_p.h --- a/src/declarative/qml/qdeclarativescriptparser_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativescriptparser_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -103,7 +103,6 @@ bool parse(const QByteArray &data, const QUrl &url = QUrl()); QList referencedTypes() const; - QList referencedResources() const; QDeclarativeParser::Object *tree() const; QList imports() const; @@ -112,7 +111,18 @@ QList errors() const; + class JavaScriptMetaData { + public: + JavaScriptMetaData() + : pragmas(QDeclarativeParser::Object::ScriptBlock::None) {} + + QDeclarativeParser::Object::ScriptBlock::Pragmas pragmas; + QList imports; + }; + static QDeclarativeParser::Object::ScriptBlock::Pragmas extractPragmas(QString &); + static JavaScriptMetaData extractMetaData(QString &); + // ### private: TypeReference *findOrCreateType(const QString &name); @@ -127,7 +137,6 @@ QDeclarativeParser::Object *root; QList _imports; QList _refTypes; - QList _refUrls; QString _scriptFile; QDeclarativeScriptParserJsASTData *data; };