From a6453627640151474c5348f09ff9e8b592648c70 Mon Sep 17 00:00:00 2001
From: Tasuku Suzuki <tasuku.suzuki@nokia.com>
Date: Mon, 12 Apr 2010 13:33:16 +0200
Subject: Fix QT_NO_MOVIE

Merge-request: 2360
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
---
 src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp   | 4 ++++
 src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h   | 4 ++++
 src/declarative/graphicsitems/qdeclarativeanimatedimage_p_p.h | 4 ++++
 src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp     | 2 ++
 4 files changed, 14 insertions(+)

diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
index f14f773..08ede7d 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 6ab66b3..b148fa4 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
@@ -103,4 +105,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 7989a27..2af14f6 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<QGraphicsBlurEffect>("Qt",4,6,"Blur");
     qmlRegisterType<QDeclarativeBorderImage>("Qt",4,6,"BorderImage");
     qmlRegisterType<QGraphicsColorizeEffect>("Qt",4,6,"Colorize");
-- 
cgit v0.12