diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2010-04-14 05:49:48 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2010-04-14 05:49:48 (GMT) |
| commit | 6f613c3771a93f74462c6cb7ad105f258a112a4f (patch) | |
| tree | a338e4682dc857658824e7f07efe9ca57e4b9d0e /src/declarative | |
| parent | 37581fa549c5cbe56afc68c71fa97d8f933512c0 (diff) | |
| parent | 2333ad8b4b93337c2515bc673b100c47b45e516b (diff) | |
| download | Qt-6f613c3771a93f74462c6cb7ad105f258a112a4f.zip Qt-6f613c3771a93f74462c6cb7ad105f258a112a4f.tar.gz Qt-6f613c3771a93f74462c6cb7ad105f258a112a4f.tar.bz2 | |
Integrate merge-request #2361 into branch '4.7'
Tasuku Suzuki (1):
Fix QT_NO_GRAPHICSEFFECT
Reviewed-by: Alexis Menard <alexis.menard@nokia.com>
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeeffects_p.h | 2 | ||||
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeeffects_p.h b/src/declarative/graphicsitems/qdeclarativeeffects_p.h index 73eec6a..0de5854 100644 --- a/src/declarative/graphicsitems/qdeclarativeeffects_p.h +++ b/src/declarative/graphicsitems/qdeclarativeeffects_p.h @@ -56,10 +56,12 @@ #include <qdeclarative.h> #include <QtGui/qgraphicseffect.h> +#ifndef QT_NO_GRAPHICSEFFECT QML_DECLARE_TYPE(QGraphicsEffect) QML_DECLARE_TYPE(QGraphicsBlurEffect) QML_DECLARE_TYPE(QGraphicsColorizeEffect) QML_DECLARE_TYPE(QGraphicsDropShadowEffect) QML_DECLARE_TYPE(QGraphicsOpacityEffect) +#endif #endif // QDECLARATIVEEFFECTS_P_H diff --git a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp index eb055da..731b1aa 100644 --- a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp @@ -83,12 +83,9 @@ void QDeclarativeItemModule::defineModule() { qmlRegisterType<QDeclarativeAnimatedImage>("Qt",4,6,"AnimatedImage"); - qmlRegisterType<QGraphicsBlurEffect>("Qt",4,6,"Blur"); qmlRegisterType<QDeclarativeBorderImage>("Qt",4,6,"BorderImage"); - qmlRegisterType<QGraphicsColorizeEffect>("Qt",4,6,"Colorize"); qmlRegisterType<QDeclarativeColumn>("Qt",4,6,"Column"); qmlRegisterType<QDeclarativeDrag>("Qt",4,6,"Drag"); - qmlRegisterType<QGraphicsDropShadowEffect>("Qt",4,6,"DropShadow"); qmlRegisterType<QDeclarativeFlickable>("Qt",4,6,"Flickable"); qmlRegisterType<QDeclarativeFlipable>("Qt",4,6,"Flipable"); qmlRegisterType<QDeclarativeFlow>("Qt",4,6,"Flow"); @@ -104,7 +101,6 @@ void QDeclarativeItemModule::defineModule() qmlRegisterType<QDeclarativeListView>("Qt",4,6,"ListView"); qmlRegisterType<QDeclarativeLoader>("Qt",4,6,"Loader"); qmlRegisterType<QDeclarativeMouseArea>("Qt",4,6,"MouseArea"); - qmlRegisterType<QGraphicsOpacityEffect>("Qt",4,6,"Opacity"); qmlRegisterType<QDeclarativePath>("Qt",4,6,"Path"); qmlRegisterType<QDeclarativePathAttribute>("Qt",4,6,"PathAttribute"); qmlRegisterType<QDeclarativePathCubic>("Qt",4,6,"PathCubic"); @@ -129,7 +125,6 @@ void QDeclarativeItemModule::defineModule() qmlRegisterType<QDeclarativeVisualItemModel>("Qt",4,6,"VisualItemModel"); qmlRegisterType<QDeclarativeAnchors>(); - qmlRegisterType<QGraphicsEffect>(); qmlRegisterType<QDeclarativeKeyEvent>(); qmlRegisterType<QDeclarativeMouseEvent>(); qmlRegisterType<QGraphicsObject>(); @@ -144,6 +139,13 @@ void QDeclarativeItemModule::defineModule() qmlRegisterType<QAction>(); qmlRegisterType<QDeclarativePen>(); qmlRegisterType<QDeclarativeFlickableVisibleArea>(); +#ifndef QT_NO_GRAPHICSEFFECT + qmlRegisterType<QGraphicsEffect>(); + qmlRegisterType<QGraphicsBlurEffect>("Qt",4,6,"Blur"); + qmlRegisterType<QGraphicsColorizeEffect>("Qt",4,6,"Colorize"); + qmlRegisterType<QGraphicsDropShadowEffect>("Qt",4,6,"DropShadow"); + qmlRegisterType<QGraphicsOpacityEffect>("Qt",4,6,"Opacity"); +#endif #ifdef QT_WEBKIT_LIB qmlRegisterType<QDeclarativeWebSettings>(); #endif |