summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGareth Stockwell <ext-gareth.stockwell@nokia.com>2010-05-25 15:58:33 (GMT)
committerGareth Stockwell <ext-gareth.stockwell@nokia.com>2010-05-25 15:58:33 (GMT)
commit603df0ef7d92c8492af5957f3f6cc9d9fbc48888 (patch)
treeb33225cecc1a741953a65adb1c541e8579800d93
parent3955a8d51f951b3c8cc7a6ceb565370391f83294 (diff)
parent7a028adec5ee09d72d2ca69a666a096cdfef972b (diff)
downloadQt-603df0ef7d92c8492af5957f3f6cc9d9fbc48888.zip
Qt-603df0ef7d92c8492af5957f3f6cc9d9fbc48888.tar.gz
Qt-603df0ef7d92c8492af5957f3f6cc9d9fbc48888.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
-rw-r--r--src/gui/s60framework/qs60mainappui.cpp8
1 files changed, 8 insertions, 0 deletions
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);
}