diff options
author | Warwick Allison <warwick.allison@nokia.com> | 2010-04-27 00:15:36 (GMT) |
---|---|---|
committer | Warwick Allison <warwick.allison@nokia.com> | 2010-04-27 00:15:36 (GMT) |
commit | c7da65069b178d3edf82e05c4b954ac1270cc700 (patch) | |
tree | b2b1b57b1a4e3c13258f30686aa3008ca2aad30b | |
parent | 70e80c18f6deda35fabd55d5147cf3d949821c28 (diff) | |
download | Qt-c7da65069b178d3edf82e05c4b954ac1270cc700.zip Qt-c7da65069b178d3edf82e05c4b954ac1270cc700.tar.gz Qt-c7da65069b178d3edf82e05c4b954ac1270cc700.tar.bz2 |
Fix remaining 4.6 type registrations (to 4.7).
Missed/cross-paths with a29627231a02ebf98645675acbd353618d1109d4.
Task-number: QTBUG-10081
-rw-r--r-- | src/declarative/util/qdeclarativeutilmodule.cpp | 4 | ||||
-rw-r--r-- | tools/qml/qmlruntime.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/util/qdeclarativeutilmodule.cpp b/src/declarative/util/qdeclarativeutilmodule.cpp index eb59fb1..3cf07a7 100644 --- a/src/declarative/util/qdeclarativeutilmodule.cpp +++ b/src/declarative/util/qdeclarativeutilmodule.cpp @@ -122,6 +122,6 @@ void QDeclarativeUtilModule::defineModule() qmlRegisterUncreatableType<QDeclarativeAbstractAnimation>("Qt",4,7,"Animation",QDeclarativeAbstractAnimation::tr("Animation is an abstract class")); qmlRegisterCustomType<QDeclarativeListModel>("Qt", 4,7, "ListModel", new QDeclarativeListModelParser); - qmlRegisterCustomType<QDeclarativePropertyChanges>("Qt", 4, 6, "PropertyChanges", new QDeclarativePropertyChangesParser); - qmlRegisterCustomType<QDeclarativeConnections>("Qt", 4, 6, "Connections", new QDeclarativeConnectionsParser); + qmlRegisterCustomType<QDeclarativePropertyChanges>("Qt", 4, 7, "PropertyChanges", new QDeclarativePropertyChangesParser); + qmlRegisterCustomType<QDeclarativeConnections>("Qt", 4, 7, "Connections", new QDeclarativeConnectionsParser); } diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp index 9b9e4fe..008f163 100644 --- a/tools/qml/qmlruntime.cpp +++ b/tools/qml/qmlruntime.cpp @@ -1440,7 +1440,7 @@ void QDeclarativeViewer::registerTypes() if (!registered) { // registering only for exposing the DeviceOrientation::Orientation enum - qmlRegisterUncreatableType<DeviceOrientation>("Qt",4,6,"Orientation",""); + qmlRegisterUncreatableType<DeviceOrientation>("Qt",4,7,"Orientation",""); registered = true; } } |