1 files changed, 12 insertions, 12 deletions

diff --git a/src/qml/qml/qqmltypemodule.cpp b/src/qml/qml/qqmltypemodule.cpp
index 9d6f269030..e6bf796d74 100644
--- a/src/qml/qml/qqmltypemodule.cpp
+++ b/src/qml/qml/qqmltypemodule.cpp
@@ -45,7 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QQmlTypeModule::QQmlTypeModule(const QString &module, int majorVersion)
+QQmlTypeModule::QQmlTypeModule(const QString &module, quint8 majorVersion)
     : d(new QQmlTypeModulePrivate(module, majorVersion))
 {
 }
@@ -61,23 +61,23 @@ QString QQmlTypeModule::module() const
     return d->module;
 }
 
-int QQmlTypeModule::majorVersion() const
+quint8 QQmlTypeModule::majorVersion() const
 {
     // No need to lock. d->majorVersion is const
     return d->majorVersion;
 }
 
-int QQmlTypeModule::minimumMinorVersion() const
+quint8 QQmlTypeModule::minimumMinorVersion() const
 {
     return d->minMinorVersion.loadRelaxed();
 }
 
-int QQmlTypeModule::maximumMinorVersion() const
+quint8 QQmlTypeModule::maximumMinorVersion() const
 {
     return d->maxMinorVersion.loadRelaxed();
 }
 
-void QQmlTypeModule::addMinorVersion(int version)
+void QQmlTypeModule::addMinorVersion(quint8 version)
 {
     for (int oldVersion = d->minMinorVersion.loadRelaxed();
          oldVersion > version && !d->minMinorVersion.testAndSetOrdered(oldVersion, version);
@@ -93,16 +93,16 @@ void QQmlTypeModule::addMinorVersion(int version)
 void QQmlTypeModule::add(QQmlTypePrivate *type)
 {
     QMutexLocker lock(&d->mutex);
-    addMinorVersion(type->version_min);
+    addMinorVersion(type->version.minorVersion());
 
     QList<QQmlTypePrivate *> &list = d->typeHash[type->elementName];
     for (int ii = 0; ii < list.count(); ++ii) {
         QQmlTypePrivate *in_list = list.at(ii);
         Q_ASSERT(in_list);
-        if (in_list->version_min < type->version_min) {
+        if (in_list->version.minorVersion() < type->version.minorVersion()) {
             list.insert(ii, type);
             return;
-        } else if (in_list->version_min == type->version_min) {
+        } else if (in_list->version.minorVersion() == type->version.minorVersion()) {
             list[ii] = type;
             return;
         }
@@ -137,26 +137,26 @@ void QQmlTypeModule::lock()
     d->locked.storeRelaxed(1);
 }
 
-QQmlType QQmlTypeModule::type(const QHashedStringRef &name, int minor) const
+QQmlType QQmlTypeModule::type(const QHashedStringRef &name, QTypeRevision version) const
 {
     QMutexLocker lock(&d->mutex);
     QList<QQmlTypePrivate *> *types = d->typeHash.value(name);
     if (types) {
         for (int ii = 0; ii < types->count(); ++ii)
-            if (types->at(ii)->version_min <= minor)
+            if (types->at(ii)->version.minorVersion() <= version.minorVersion())
                 return QQmlType(types->at(ii));
     }
 
     return QQmlType();
 }
 
-QQmlType QQmlTypeModule::type(const QV4::String *name, int minor) const
+QQmlType QQmlTypeModule::type(const QV4::String *name, QTypeRevision version) const
 {
     QMutexLocker lock(&d->mutex);
     QList<QQmlTypePrivate *> *types = d->typeHash.value(name);
     if (types) {
         for (int ii = 0; ii < types->count(); ++ii)
-            if (types->at(ii)->version_min <= minor)
+            if (types->at(ii)->version.minorVersion() <= version.minorVersion())
                 return QQmlType(types->at(ii));
     }