From dc65a73fa38d1f85b75e9d4ad71ebdbc1c7d85f5 Mon Sep 17 00:00:00 2001
From: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Date: Fri, 15 Apr 2011 14:51:34 +0200
Subject: Build fix for transition effect support on S60 5.0.

Task-number: QT-4718
Reviewed-by: TRUSTME
---
 src/gui/kernel/kernel.pri |  2 ++
 src/gui/kernel/qt_s60_p.h | 10 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri
index f9c84c1..467eb9b 100644
--- a/src/gui/kernel/kernel.pri
+++ b/src/gui/kernel/kernel.pri
@@ -111,6 +111,8 @@ win32 {
 }
 
 symbian {
+    exists($${EPOCROOT}epoc32/include/platform/mw/akntranseffect.h): DEFINES += QT_SYMBIAN_HAVE_AKNTRANSEFFECT_H
+
     SOURCES += \
         kernel/qapplication_s60.cpp \
         kernel/qeventdispatcher_s60.cpp \
diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/kernel/qt_s60_p.h
index da44016..8aba53a 100644
--- a/src/gui/kernel/qt_s60_p.h
+++ b/src/gui/kernel/qt_s60_p.h
@@ -78,8 +78,10 @@
 #include <eikspane.h>               // CEikStatusPane
 #include <AknPopupFader.h>          // MAknFadedComponent and TAknPopupFader
 #include <gfxtranseffect/gfxtranseffect.h> // BeginFullScreen
+#ifdef QT_SYMBIAN_HAVE_AKNTRANSEFFECT_H
 #include <akntranseffect.h> // BeginFullScreen
 #endif
+#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -577,7 +579,7 @@ bool qt_symbian_is_cursor_visible();
 
 static inline bool qt_beginFullScreenEffect()
 {
-#ifdef Q_WS_S60
+#if defined(Q_WS_S60) && defined(QT_SYMBIAN_HAVE_AKNTRANSEFFECT_H)
     // Only for post-S^3. On earlier versions the system transition effects
     // may not be able to capture the non-Avkon content, leading to confusing
     // looking effects, so just skip the whole thing.
@@ -593,12 +595,14 @@ static inline bool qt_beginFullScreenEffect()
         AknTransEffect::GfxTransParam(S60->uid,
             AknTransEffect::TParameter::EAvkonCheck | KQtAppExitFlag));
     return true;
+#else
+    return false;
 #endif
 }
 
 static inline void qt_abortFullScreenEffect()
 {
-#ifdef Q_WS_S60
+#if defined(Q_WS_S60) && defined(QT_SYMBIAN_HAVE_AKNTRANSEFFECT_H)
     if (!S60->beginFullScreenCalled || QSysInfo::s60Version() <= QSysInfo::SV_S60_5_2)
         return;
     GfxTransEffect::AbortFullScreen();
@@ -608,7 +612,7 @@ static inline void qt_abortFullScreenEffect()
 
 static inline void qt_endFullScreenEffect()
 {
-#ifdef Q_WS_S60
+#if defined(Q_WS_S60) && defined(QT_SYMBIAN_HAVE_AKNTRANSEFFECT_H)
     if (S60->endFullScreenCalled || QSysInfo::s60Version() <= QSysInfo::SV_S60_5_2)
         return;
     S60->endFullScreenCalled = true;
-- 
cgit v0.12