diff options
Diffstat (limited to 'src/qmltyperegistrar/qmltypescreator.cpp')
| -rw-r--r-- | src/qmltyperegistrar/qmltypescreator.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/qmltyperegistrar/qmltypescreator.cpp b/src/qmltyperegistrar/qmltypescreator.cpp index 911120027e..8991ee42b6 100644 --- a/src/qmltyperegistrar/qmltypescreator.cpp +++ b/src/qmltyperegistrar/qmltypescreator.cpp @@ -35,6 +35,7 @@ #include <QtCore/qsavefile.h> #include <QtCore/qfile.h> #include <QtCore/qjsondocument.h> +#include <QtCore/qversionnumber.h> static QString enquote(const QString &string) { @@ -63,13 +64,11 @@ void QmlTypesCreator::writeClassProperties(const QmlTypesClassDescription &colle QStringList metaObjects; for (auto it = collector.revisions.begin(), end = collector.revisions.end(); it != end; ++it) { - const int revision = *it; + const QTypeRevision revision = *it; if (revision < collector.addedInRevision) continue; - if (collector.removedInRevision > collector.addedInRevision - && revision >= collector.removedInRevision) { + if (collector.removedInRevision.isValid() && !(revision < collector.removedInRevision)) break; - } if (collector.isBuiltin) { exports.append(enquote(QString::fromLatin1("QML/%1 1.0").arg(collector.elementName))); @@ -78,8 +77,8 @@ void QmlTypesCreator::writeClassProperties(const QmlTypesClassDescription &colle exports.append(enquote(QString::fromLatin1("%1/%2 %3.%4") .arg(m_module).arg(collector.elementName) - .arg(m_majorVersion).arg(revision))); - metaObjects.append(QString::number(revision)); + .arg(m_version.majorVersion()).arg(revision.minorVersion()))); + metaObjects.append(QString::number(revision.toEncodedVersion<quint16>())); } m_qml.writeArrayBinding(QLatin1String("exports"), exports); |