diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-03-18 18:21:18 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-19 08:32:33 +0100 |
| commit | 89218c6d0eeec66025c62bb2e063ea067426445a (patch) | |
| tree | 1a56c5da6120b9b9176e4d519440604c5336cbdb /src/qml/qml/qqmltypeloader_p.h | |
| parent | c33a79f0a0de8f01b3a43335778e246e1f02598e (diff) | |
Clean up script imports
Move the .pragma and .import script extraction out of qqmlscript and
into qqmlirbuilder, where it can populate a QQmlIR::Document. Changed
the script part of the type loader to use that, which also allowed
eliminating the m_source member and m_metaData.
Change-Id: Icc64d219fff5666679a02e6afda73f7edfca132b
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmltypeloader_p.h')
| -rw-r--r-- | src/qml/qml/qqmltypeloader_p.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h index fa606bf1a9..24daa35a6f 100644 --- a/src/qml/qml/qqmltypeloader_p.h +++ b/src/qml/qml/qqmltypeloader_p.h @@ -498,7 +498,6 @@ public: QString urlString; QQmlTypeNameCache *importCache; QList<QQmlScriptBlob *> scripts; - QQmlScript::Object::ScriptBlock::Pragmas pragmas; QV4::PersistentValue scriptValueForContext(QQmlContextData *parentCtxt); @@ -546,11 +545,10 @@ protected: private: virtual void scriptImported(QQmlScriptBlob *blob, const QQmlScript::Location &location, const QString &qualifier, const QString &nameSpace); - QString m_source; - QQmlScript::Parser::JavaScriptMetaData m_metadata; - QList<ScriptReference> m_scripts; QQmlScriptData *m_scriptData; + QList<QQmlScript::Import> m_imports; // ### temporary until addImport is changed + QmlIR::Document m_irUnit; }; class Q_AUTOTEST_EXPORT QQmlQmldirData : public QQmlTypeLoader::Blob |