diff options
| author | Christian Kamm <christian.d.kamm@nokia.com> | 2011-09-21 12:42:27 +0200 |
|---|---|---|
| committer | Christian Kamm <christian.d.kamm@nokia.com> | 2011-09-26 12:04:16 +0200 |
| commit | fdd0a15ef4265a39db6e33b6353f5231966fdb5d (patch) | |
| tree | ae0fa0921a29eb4f7705be96201ee74b0086e867 /src/libs/languageutils/fakemetaobject.cpp | |
| parent | 22e2c0ad2c97df2173ead3c2ab8977c8970dd4c5 (diff) | |
QmlJS: Separate metaObjectRevision from minor version number.
They need not to be identical. Additionally:
* Rename ImportInfo::name to path, because that's what it does.
* Add ImportInfo::name, for getting the uri with the names
separated by dots.
* Allow for exportMetaObjectRevisions in qmltypes files.
* Allow for exports with an empty type name, as generated by
qmlRegisterRevision. They are used for associating meta object
revisions with non-exported types.
* Rewrite the Qt 4.7 import to QtQuick 1.0 at an early stage. In
preparation for the Qt 5 type information update, where Qt 4.7
is gone.
Change-Id: Ia287193623d9530a56b9eb8d2481d50aabd94c3e
Reviewed-on: http://codereview.qt-project.org/5309
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Diffstat (limited to 'src/libs/languageutils/fakemetaobject.cpp')
| -rw-r--r-- | src/libs/languageutils/fakemetaobject.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/libs/languageutils/fakemetaobject.cpp b/src/libs/languageutils/fakemetaobject.cpp index 6f47fbc2f0..c7a9c6d01e 100644 --- a/src/libs/languageutils/fakemetaobject.cpp +++ b/src/libs/languageutils/fakemetaobject.cpp @@ -157,11 +157,14 @@ void FakeMetaObject::addExport(const QString &name, const QString &package, Comp exp.type = name; exp.package = package; exp.version = version; - exp.packageNameVersion = QString::fromLatin1("%1/%2 %3").arg( - package, name, - version.toString()); m_exports.append(exp); } + +void FakeMetaObject::setExportMetaObjectRevision(int exportIndex, int metaObjectRevision) +{ + m_exports[exportIndex].metaObjectRevision = metaObjectRevision; +} + QList<FakeMetaObject::Export> FakeMetaObject::exports() const { return m_exports; } FakeMetaObject::Export FakeMetaObject::exportInPackage(const QString &package) const @@ -219,5 +222,8 @@ QString FakeMetaObject::attachedTypeName() const void FakeMetaObject::setAttachedTypeName(const QString &name) { m_attachedTypeName = name; } +FakeMetaObject::Export::Export() + : metaObjectRevision(0) +{} bool FakeMetaObject::Export::isValid() const -{ return !type.isEmpty(); } +{ return version.isValid() || !package.isEmpty() || !type.isEmpty(); } |