diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-04-21 16:30:11 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-04-21 16:30:11 (GMT) |
| commit | a29627231a02ebf98645675acbd353618d1109d4 (patch) | |
| tree | 20913c1c3e98d6047e71a3dc6f713b0c2f110b5c /src/declarative/qml | |
| parent | 871d67bb95a816bcf10aca5ee90f8a044427a25d (diff) | |
| download | Qt-a29627231a02ebf98645675acbd353618d1109d4.zip Qt-a29627231a02ebf98645675acbd353618d1109d4.tar.gz Qt-a29627231a02ebf98645675acbd353618d1109d4.tar.bz2 | |
Fix versioning of Qt Declarative's in-built types
Since we aren't releasing for 4.6, all types are new in 4.7.
Task-number: QTBUG-10081
Diffstat (limited to 'src/declarative/qml')
| -rw-r--r-- | src/declarative/qml/qdeclarativecompiler.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 6 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativevaluetype.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp index 10cd886..edafe59 100644 --- a/src/declarative/qml/qdeclarativecompiler.cpp +++ b/src/declarative/qml/qdeclarativecompiler.cpp @@ -1258,7 +1258,7 @@ bool QDeclarativeCompiler::buildSubObject(Object *obj, const BindingContext &ctx int QDeclarativeCompiler::componentTypeRef() { - QDeclarativeType *t = QDeclarativeMetaType::qmlType("Qt/Component",4,6); + QDeclarativeType *t = QDeclarativeMetaType::qmlType("Qt/Component",4,7); for (int ii = output->types.count() - 1; ii >= 0; --ii) { if (output->types.at(ii).type == t) return ii; diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index a41eaa9..6d64f63 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -144,9 +144,9 @@ static bool qt_QmlQtModule_registered = false; void QDeclarativeEnginePrivate::defineModule() { - qmlRegisterType<QDeclarativeComponent>("Qt",4,6,"Component"); - qmlRegisterType<QObject>("Qt",4,6,"QtObject"); - qmlRegisterType<QDeclarativeWorkerScript>("Qt",4,6,"WorkerScript"); + qmlRegisterType<QDeclarativeComponent>("Qt",4,7,"Component"); + qmlRegisterType<QObject>("Qt",4,7,"QtObject"); + qmlRegisterType<QDeclarativeWorkerScript>("Qt",4,7,"WorkerScript"); qmlRegisterType<QDeclarativeBinding>(); } diff --git a/src/declarative/qml/qdeclarativevaluetype.cpp b/src/declarative/qml/qdeclarativevaluetype.cpp index d4bb8ee..c6fe161 100644 --- a/src/declarative/qml/qdeclarativevaluetype.cpp +++ b/src/declarative/qml/qdeclarativevaluetype.cpp @@ -61,7 +61,7 @@ int qmlRegisterValueTypeEnums(const char *qmlName) QString(), - "Qt", 4, 6, qmlName, &T::staticMetaObject, + "Qt", 4, 7, qmlName, &T::staticMetaObject, 0, 0, |