diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-03-18 08:46:33 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-19 08:32:23 +0100 |
| commit | c33a79f0a0de8f01b3a43335778e246e1f02598e (patch) | |
| tree | 7a0d9c176b0bbfa894ea90919ab71627d31d35f3 /src/qml/qml/qqmltypeloader_p.h | |
| parent | 3b2e7bf03b656b38ba7b24acf7ed38de555635f1 (diff) | |
Clean, part 3
* Get rid of QQmlScript::Pragma
* Allow retrieving the QML unit size after generation
* Add flag equivalent of .pragma library to QV4::CompiledData
* Remove unused method
Change-Id: I2f95b83f919004013741bc539c82960cc878f3a4
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 6e759266ef..fa606bf1a9 100644 --- a/src/qml/qml/qqmltypeloader_p.h +++ b/src/qml/qml/qqmltypeloader_p.h @@ -68,6 +68,7 @@ #include <private/qqmldirparser_p.h> #include <private/qqmlbundle_p.h> #include <private/qflagpointer_p.h> +#include <private/qqmlirbuilder_p.h> #include <private/qv4value_inl_p.h> #include <private/qv4script_p.h> @@ -279,7 +280,7 @@ public: protected: bool addImport(const QQmlScript::Import &import, QList<QQmlError> *errors); - bool addPragma(const QQmlScript::Pragma &pragma, QList<QQmlError> *errors); + bool addPragma(const QmlIR::Pragma &pragma, QList<QQmlError> *errors); bool fetchQmldir(const QUrl &url, const QQmlScript::Import *import, int priority, QList<QQmlError> *errors); bool updateQmldir(QQmlQmldirData *data, const QQmlScript::Import *import, QList<QQmlError> *errors); @@ -457,7 +458,6 @@ private: QScopedPointer<QmlIR::Document> m_document; QList<QQmlScript::Import> m_imports; - QList<QQmlScript::Pragma> m_pragmas; QList<ScriptReference> m_scripts; @@ -537,8 +537,6 @@ public: QQmlScriptBlob *script; }; - QQmlScript::Object::ScriptBlock::Pragmas pragmas() const; - QQmlScriptData *scriptData() const; protected: |