From c7da65069b178d3edf82e05c4b954ac1270cc700 Mon Sep 17 00:00:00 2001 From: Warwick Allison Date: Tue, 27 Apr 2010 10:15:36 +1000 Subject: Fix remaining 4.6 type registrations (to 4.7). Missed/cross-paths with a29627231a02ebf98645675acbd353618d1109d4. Task-number: QTBUG-10081 --- src/declarative/util/qdeclarativeutilmodule.cpp | 4 ++-- 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("Qt",4,7,"Animation",QDeclarativeAbstractAnimation::tr("Animation is an abstract class")); qmlRegisterCustomType("Qt", 4,7, "ListModel", new QDeclarativeListModelParser); - qmlRegisterCustomType("Qt", 4, 6, "PropertyChanges", new QDeclarativePropertyChangesParser); - qmlRegisterCustomType("Qt", 4, 6, "Connections", new QDeclarativeConnectionsParser); + qmlRegisterCustomType("Qt", 4, 7, "PropertyChanges", new QDeclarativePropertyChangesParser); + qmlRegisterCustomType("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("Qt",4,6,"Orientation",""); + qmlRegisterUncreatableType("Qt",4,7,"Orientation",""); registered = true; } } -- cgit v0.12