diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-04-22 03:18:13 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-04-22 03:18:13 (GMT) |
| commit | fb94bfda66ac8767c96cb521a1f77c6b8be5bb95 (patch) | |
| tree | b4fdd4165ff33ed78d9485c089afb2e11b526e18 /src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp | |
| parent | 6b03492619243a1ede75ba324b8422304c662231 (diff) | |
| parent | e6b5d2a4df73aa26812e26daa3199443bd84cc90 (diff) | |
| download | Qt-fb94bfda66ac8767c96cb521a1f77c6b8be5bb95.zip Qt-fb94bfda66ac8767c96cb521a1f77c6b8be5bb95.tar.gz Qt-fb94bfda66ac8767c96cb521a1f77c6b8be5bb95.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp index 8e34472..4238c53 100644 --- a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp @@ -46,7 +46,6 @@ #include <QtGui/qgraphicseffect.h> #include "private/qdeclarativeevents_p_p.h" -#include "private/qdeclarativeeffects_p.h" #include "private/qdeclarativescalegrid_p_p.h" #include "private/qdeclarativeanimatedimage_p.h" #include "private/qdeclarativeborderimage_p.h" @@ -144,19 +143,6 @@ void QDeclarativeItemModule::defineModule() qmlRegisterType<QAction>(); qmlRegisterType<QDeclarativePen>(); qmlRegisterType<QDeclarativeFlickableVisibleArea>(); -#ifdef QT_NO_GRAPHICSEFFECT - QString no_graphicseffect = qApp->translate("QGraphicsBlurEffect","Qt was built without support for graphicseffects"); - qmlRegisterTypeNotAvailable("Qt",4,7,"Blur",no_graphicseffect); - qmlRegisterTypeNotAvailable("Qt",4,7,"Colorize",no_graphicseffect); - qmlRegisterTypeNotAvailable("Qt",4,7,"DropShadow",no_graphicseffect); - qmlRegisterTypeNotAvailable("Qt",4,7,"Opacity",no_graphicseffect); -#else - qmlRegisterType<QGraphicsEffect>(); - qmlRegisterType<QGraphicsBlurEffect>("Qt",4,7,"Blur"); - qmlRegisterType<QGraphicsColorizeEffect>("Qt",4,7,"Colorize"); - qmlRegisterType<QGraphicsDropShadowEffect>("Qt",4,7,"DropShadow"); - qmlRegisterType<QGraphicsOpacityEffect>("Qt",4,7,"Opacity"); -#endif qmlRegisterUncreatableType<QDeclarativeKeyNavigationAttached>("Qt",4,7,"KeyNavigation",QDeclarativeKeyNavigationAttached::tr("KeyNavigation is only available via attached properties")); qmlRegisterUncreatableType<QDeclarativeKeysAttached>("Qt",4,7,"Keys",QDeclarativeKeysAttached::tr("Keys is only available via attached properties")); |