diff options
author | aavit <qt-info@nokia.com> | 2010-03-08 11:02:55 (GMT) |
---|---|---|
committer | aavit <qt-info@nokia.com> | 2010-03-08 11:02:55 (GMT) |
commit | f06bc0b434953ba05d822cc1500e5d490c8f629d (patch) | |
tree | 1f6d8b036c4d6ac2e855a04f024fa27570d81769 /src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp | |
parent | 6f17a21647fe50ea79dd902220c1887b893f25b3 (diff) | |
parent | d2d519f72433d70c342ed4cf0827a10ab0cdfdad (diff) | |
download | Qt-f06bc0b434953ba05d822cc1500e5d490c8f629d.zip Qt-f06bc0b434953ba05d822cc1500e5d490c8f629d.tar.gz Qt-f06bc0b434953ba05d822cc1500e5d490c8f629d.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp')
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp index f3b9385..25660f8 100644 --- a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp @@ -106,7 +106,6 @@ void QDeclarativeItemModule::defineModule() QML_REGISTER_TYPE(Qt,4,6,LayoutItem,QDeclarativeLayoutItem); QML_REGISTER_TYPE(Qt,4,6,ListView,QDeclarativeListView); QML_REGISTER_TYPE(Qt,4,6,Loader,QDeclarativeLoader); - QML_REGISTER_TYPE(Qt,4,6,MouseRegion,QDeclarativeMouseArea); QML_REGISTER_TYPE(Qt,4,6,MouseArea,QDeclarativeMouseArea); QML_REGISTER_TYPE(Qt,4,6,Opacity,QGraphicsOpacityEffect); QML_REGISTER_TYPE(Qt,4,6,ParticleMotion,QDeclarativeParticleMotion); @@ -139,9 +138,6 @@ void QDeclarativeItemModule::defineModule() QML_REGISTER_TYPE(Qt,4,6,VisibleArea,QDeclarativeFlickableVisibleArea); QML_REGISTER_TYPE(Qt,4,6,VisualDataModel,QDeclarativeVisualDataModel); QML_REGISTER_TYPE(Qt,4,6,VisualItemModel,QDeclarativeVisualItemModel); -#ifdef QT_WEBKIT_LIB - QML_REGISTER_TYPE(Qt,4,6,WebView,QDeclarativeWebView); -#endif QML_REGISTER_NOCREATE_TYPE(QDeclarativeAnchors); QML_REGISTER_NOCREATE_TYPE(QGraphicsEffect); |