diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-01-06 01:10:38 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-01-06 01:10:38 (GMT) |
| commit | fa5c838636a8cf4e483706696d19afef495da994 (patch) | |
| tree | 800621bf8d4c203109dce2d48862a48719e29b43 | |
| parent | 5c11ca38c441dd0e4e105ca0b5372dc917cf31b1 (diff) | |
| download | Qt-fa5c838636a8cf4e483706696d19afef495da994.zip Qt-fa5c838636a8cf4e483706696d19afef495da994.tar.gz Qt-fa5c838636a8cf4e483706696d19afef495da994.tar.bz2 | |
Fix version in previous commit. Had already been bumped.
The version had already been bumped from 0 to 1. Only the version
check was required.
Task-number: QTBUG-13451
Reviewed-by: Aaron Kennedy
| -rw-r--r-- | src/declarative/qml/qdeclarative.h | 4 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativemetatype.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/qml/qdeclarative.h b/src/declarative/qml/qdeclarative.h index cdd7202..8a6d068 100644 --- a/src/declarative/qml/qdeclarative.h +++ b/src/declarative/qml/qdeclarative.h @@ -199,7 +199,7 @@ int qmlRegisterType(const char *uri, int versionMajor, int versionMinor, const c QByteArray listName("QDeclarativeListProperty<" + name + ">"); QDeclarativePrivate::RegisterType type = { - 2, + 1, qRegisterMetaType<T *>(pointerName.constData()), qRegisterMetaType<QDeclarativeListProperty<T> >(listName.constData()), @@ -233,7 +233,7 @@ int qmlRegisterRevision(const char *uri, int versionMajor, int versionMinor) QByteArray listName("QDeclarativeListProperty<" + name + ">"); QDeclarativePrivate::RegisterType type = { - 2, + 1, qRegisterMetaType<T *>(pointerName.constData()), qRegisterMetaType<QDeclarativeListProperty<T> >(listName.constData()), diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp index e90fa40..48a63bb 100644 --- a/src/declarative/qml/qdeclarativemetatype.cpp +++ b/src/declarative/qml/qdeclarativemetatype.cpp @@ -200,7 +200,7 @@ QDeclarativeType::QDeclarativeType(int index, const QDeclarativePrivate::Registe d->m_name = name; d->m_version_maj = type.versionMajor; d->m_version_min = type.versionMinor; - if (type.version > 1) // revisions added in version 2 + if (type.version >= 1) // revisions added in version 1 d->m_revision = type.revision; d->m_typeId = type.typeId; d->m_listId = type.listId; |