QmlCompiler: Drop the metaobject revision from exports

Instead, output a warning if the revision doesn't match the version. We
want to get rid of generic version/revision matching. To this end, add a
way to retrieve the version from an export.

Change-Id: Ie887103eba910f14e49faa684ac559cc72cab199
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 2 insertions, 10 deletions

diff --git a/src/qmlcompiler/qqmljsscope_p.h b/src/qmlcompiler/qqmljsscope_p.h
index 40bb5ff544..d656b2f5b4 100644
--- a/src/qmlcompiler/qqmljsscope_p.h
+++ b/src/qmlcompiler/qqmljsscope_p.h
@@ -114,25 +114,18 @@ public:
     class Export {
     public:
         Export() = default;
-        Export(QString package, QString type, const QTypeRevision &version,
-               int metaObjectRevision);
+        Export(QString package, QString type, const QTypeRevision &version);
 
         bool isValid() const;
 
-        int metaObjectRevision() const { return m_metaObjectRevision; }
-        void setMetaObjectRevision(int metaObjectRevision)
-        {
-            m_metaObjectRevision = metaObjectRevision;
-        }
-
         QString package() const { return m_package; }
         QString type() const { return m_type; }
+        QTypeRevision version() const { return m_version; }
 
     private:
         QString m_package;
         QString m_type;
         QTypeRevision m_version;
-        int m_metaObjectRevision = 0;
     };
 
     struct JavaScriptIdentifier
@@ -181,7 +174,6 @@ public:
     void setInternalName(const QString &internalName) { m_internalName = internalName; }
 
     void addExport(const QString &name, const QString &package, const QTypeRevision &version);
-    void setExportMetaObjectRevision(int exportIndex, int metaObjectRevision);
     QList<Export> exports() const { return m_exports; }
 
     // If isComposite(), this is the QML/JS name of the prototype. Otherwise it's the