diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-04-27 00:56:47 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-04-27 00:56:47 (GMT) |
| commit | f341a9ef26e462d69c7cc7063efa433a77ce63c2 (patch) | |
| tree | 78582e025c5c2dd610f817e7fb25917f0ea3a2d6 /src | |
| parent | 7c85dd1abff4d2d04dc55504778bd31fc979cac3 (diff) | |
| parent | c7da65069b178d3edf82e05c4b954ac1270cc700 (diff) | |
| download | Qt-f341a9ef26e462d69c7cc7063efa433a77ce63c2.zip Qt-f341a9ef26e462d69c7cc7063efa433a77ce63c2.tar.gz Qt-f341a9ef26e462d69c7cc7063efa433a77ce63c2.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/util/qdeclarativeutilmodule.cpp | 4 |
1 files changed, 2 insertions, 2 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); } |