Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (48 commits)
  build fix for S60
  Improve handling of QAction in soft key manager
  Remove useless assert
  qdrawhelper: fix optim in 2245641ba
  QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage
  accelerate QWindowsPipeWriter for bigger chunks of data
  Fix antialiasing with transformed text in OpenGL2 paint engine
  Fix flattening of largely scaled, thin, dashed beziers.
  Increased the precision used to flatten beziers
  Fix QT_NO_MOVIE
  Fix compile error with QT_NO_ACTION in QtGui
  Fix QT_NO_COMPLETER
  Fix QT_NO_FSCOMPLETER
  Fix QT_NO_FILESYSTEMMODEL
  Build fix
  Safeguard ourselves against corrupt registry values for cleartype gamma
  fix cetest build properly
  qdrawhelper:  optimize the fetch transformed bilinear functions
  Compile fix for WinCE
  Make sure the selectionChanged signal is not called too much
  ...

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 8e5b863..6ae1782 100644
--- a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
@@ -81,7 +81,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");