diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-04-14 13:32:22 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-04-14 13:32:22 (GMT) |
| commit | 0cc27cec860f46b1e349c428973cf4ce3331b285 (patch) | |
| tree | 801b2c1d8cb6b269f2b2f18e08e052cdc4f66749 /src/declarative/graphicsitems | |
| parent | 8a7199be73aea42eacf07c56a63d2b526204c8fb (diff) | |
| parent | b371999d3e9c207047be6afda89d008b6cf04763 (diff) | |
| download | Qt-0cc27cec860f46b1e349c428973cf4ce3331b285.zip Qt-0cc27cec860f46b1e349c428973cf4ce3331b285.tar.gz Qt-0cc27cec860f46b1e349c428973cf4ce3331b285.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Conflicts:
src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
Diffstat (limited to 'src/declarative/graphicsitems')
4 files changed, 14 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp index cc062f0..6ab126d 100644 --- a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp +++ b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp @@ -42,6 +42,8 @@ #include "private/qdeclarativeanimatedimage_p.h" #include "private/qdeclarativeanimatedimage_p_p.h" +#ifndef QT_NO_MOVIE + #include <qdeclarativeengine.h> #include <QMovie> @@ -320,3 +322,5 @@ void QDeclarativeAnimatedImage::componentComplete() } QT_END_NAMESPACE + +#endif // QT_NO_MOVIE diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h b/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h index 9d8087c..5981cd3 100644 --- a/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h +++ b/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h @@ -44,6 +44,8 @@ #include "private/qdeclarativeimage_p.h" +#ifndef QT_NO_MOVIE + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -108,4 +110,6 @@ QML_DECLARE_TYPE(QDeclarativeAnimatedImage) QT_END_HEADER +#endif // QT_NO_MOVIE + #endif diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage_p_p.h b/src/declarative/graphicsitems/qdeclarativeanimatedimage_p_p.h index 8ca9755..a02893d 100644 --- a/src/declarative/graphicsitems/qdeclarativeanimatedimage_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativeanimatedimage_p_p.h @@ -55,6 +55,8 @@ #include "private/qdeclarativeimage_p_p.h" +#ifndef QT_NO_MOVIE + QT_BEGIN_NAMESPACE class QMovie; @@ -80,4 +82,6 @@ public: QT_END_NAMESPACE +#endif // QT_NO_MOVIE + #endif // QDECLARATIVEANIMATEDIMAGE_P_H diff --git a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp index 731b1aa..2d01eef 100644 --- a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp @@ -82,7 +82,9 @@ void QDeclarativeItemModule::defineModule() { +#ifndef QT_NO_MOVIE qmlRegisterType<QDeclarativeAnimatedImage>("Qt",4,6,"AnimatedImage"); +#endif qmlRegisterType<QDeclarativeBorderImage>("Qt",4,6,"BorderImage"); qmlRegisterType<QDeclarativeColumn>("Qt",4,6,"Column"); qmlRegisterType<QDeclarativeDrag>("Qt",4,6,"Drag"); |