Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration

* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
  Added some changes for 4.6.3
  Fix compilation for tst_qtextcodec with QT_NO_CONCURRENT defined.
  Allow auto-test to compile when using namespaces
  Fix regression in QVarLengthArray::operator=
  Removed unnecessary PlatSec capabilities from spectrum demo DLL
  Make test work with shadow builds again.
  Added missing PlatSec capabilities to spectrum demo DLL
  My 4.6.3 changes
  Tidy changes file for 4.6.3.
  My 4.6.3 changes
  My 4.6.3 changes
  Fix the compilation for tst_qabstractprintdialog and tst_qprinter on symbian.
  Build fix for spectrum demo when -qtnamespace is used
  Fixed license headers in spectrum demo
  Qt app draws background incorrectly when animated wallpaper is used
  Don't use QAtomicInt in statics because they are non-POD.
  QTBUG-5955: Qt fails to build on alpha architecture

2 files changed, 12 insertions, 4 deletions

diff --git a/src/gui/egl/qegl.cpp b/src/gui/egl/qegl.cpp
index 671a568..e6ea198 100644
--- a/src/gui/egl/qegl.cpp
+++ b/src/gui/egl/qegl.cpp
@@ -72,12 +72,12 @@ public:
     static bool displayOpened() { return displayOpen; }
 
 private:
-    static QAtomicInt contexts;
-    static QAtomicInt displayOpen;
+    static QBasicAtomicInt contexts;
+    static QBasicAtomicInt displayOpen;
 };
 
-QAtomicInt QEglContextTracker::contexts = 0;
-QAtomicInt QEglContextTracker::displayOpen = 0;
+QBasicAtomicInt QEglContextTracker::contexts = Q_BASIC_ATOMIC_INITIALIZER(0);
+QBasicAtomicInt QEglContextTracker::displayOpen = Q_BASIC_ATOMIC_INITIALIZER(0);
 
 // Current GL and VG contexts.  These are used to determine if
 // we can avoid an eglMakeCurrent() after a call to lazyDoneCurrent().
diff --git a/src/gui/s60framework/qs60mainappui.cpp b/src/gui/s60framework/qs60mainappui.cpp
index feffc9f..ce13de8 100644
--- a/src/gui/s60framework/qs60mainappui.cpp
+++ b/src/gui/s60framework/qs60mainappui.cpp
@@ -64,6 +64,9 @@
 #include <private/qt_s60_p.h>
 #include <qdebug.h>
 
+//Animated wallpapers in Qt applications are not supported.
+const TInt KAknDisableAnimationBackground = 0x02000000;
+
 QT_BEGIN_NAMESPACE
 
 /*!
@@ -115,6 +118,11 @@ void QS60MainAppUi::ConstructL()
     TInt flags = CAknAppUi::EAknEnableSkin
                  | CAknAppUi::ENoScreenFurniture
                  | CAknAppUi::ENonStandardResourceFile;
+    // After 5th Edition S60, native side supports animated wallpapers.
+	// However, there is no support for that feature on Qt side, so indicate to
+	// native UI framework that this application will not support background animations.
+    if (QSysInfo::s60Version() > QSysInfo::SV_S60_5_0)
+        flags |= KAknDisableAnimationBackground;
     BaseConstructL(flags);
 }