From c33a79f0a0de8f01b3a43335778e246e1f02598e Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@digia.com>
Date: Tue, 18 Mar 2014 08:46:33 +0100
Subject: 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>
---
 src/qml/qml/qqmltypeloader_p.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/qml/qml/qqmltypeloader_p.h')

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:
-- 
cgit v1.2.3