diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-03-23 04:53:02 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-03-23 04:53:02 (GMT) |
| commit | ccf9a964f55ce6b7404f2b2fbd9345697d37bea3 (patch) | |
| tree | a5e264ab62fce2664f079ee8fd28e55e85db9218 /src/declarative/util/qdeclarativeutilmodule.cpp | |
| parent | 95aa8c8fc76e2309a629b05994a2677b0887140b (diff) | |
| parent | ceebd7298e8d2325956e297c46a965d68c56b02f (diff) | |
| download | Qt-ccf9a964f55ce6b7404f2b2fbd9345697d37bea3.zip Qt-ccf9a964f55ce6b7404f2b2fbd9345697d37bea3.tar.gz Qt-ccf9a964f55ce6b7404f2b2fbd9345697d37bea3.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/util/qdeclarativeutilmodule.cpp')
| -rw-r--r-- | src/declarative/util/qdeclarativeutilmodule.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativeutilmodule.cpp b/src/declarative/util/qdeclarativeutilmodule.cpp index cb35734..46c9b73 100644 --- a/src/declarative/util/qdeclarativeutilmodule.cpp +++ b/src/declarative/util/qdeclarativeutilmodule.cpp @@ -85,7 +85,6 @@ void QDeclarativeUtilModule::defineModule() qmlRegisterType<QDeclarativeNumberAnimation>("Qt",4,6,"NumberAnimation"); qmlRegisterType<QDeclarativePackage>("Qt",4,6,"Package"); qmlRegisterType<QDeclarativeParallelAnimation>("Qt",4,6,"ParallelAnimation"); - qmlRegisterType<QDeclarativeParentAction>("Qt",4,6,"ParentAction"); qmlRegisterType<QDeclarativeParentAnimation>("Qt",4,6,"ParentAnimation"); qmlRegisterType<QDeclarativeParentChange>("Qt",4,6,"ParentChange"); qmlRegisterType<QDeclarativePauseAnimation>("Qt",4,6,"PauseAnimation"); |