diff -r 41300fa6a67c -r f7bc934e204c src/gui/kernel/qt_s60_p.h
--- a/src/gui/kernel/qt_s60_p.h	Tue Feb 02 00:43:10 2010 +0200
+++ b/src/gui/kernel/qt_s60_p.h	Wed Mar 31 11:06:36 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -68,12 +68,12 @@
 #include <eikappui.h>
 
 #ifdef Q_WS_S60
-#include <aknutils.h>               // AknLayoutUtils
+#include <AknUtils.h>               // AknLayoutUtils
 #include <avkon.hrh>                // EEikStatusPaneUidTitle
 #include <akntitle.h>               // CAknTitlePane
 #include <akncontext.h>             // CAknContextPane
 #include <eikspane.h>               // CEikStatusPane
-#include <aknpopupfader.h>          // MAknFadedComponent and TAknPopupFader
+#include <AknPopupFader.h>          // MAknFadedComponent and TAknPopupFader
 #endif
 
 QT_BEGIN_NAMESPACE
@@ -121,12 +121,14 @@
     int virtualMouseRequired : 1;
     int qtOwnsS60Environment : 1;
     int supportsPremultipliedAlpha : 1;
+    int avkonComponentsSupportTransparency : 1;
     QApplication::QS60MainApplicationFactory s60ApplicationFactory; // typedef'ed pointer type
     static inline void updateScreenSize();
     static inline RWsSession& wsSession();
     static inline RWindowGroup& windowGroup();
     static inline CWsScreenDevice* screenDevice();
     static inline CCoeAppUi* appUi();
+    static inline CEikMenuBar* menuBar();
 #ifdef Q_WS_S60
     static inline CEikStatusPane* statusPane();
     static inline CCoeControl* statusPaneSubPane(TInt aPaneId);
@@ -210,6 +212,7 @@
 #ifdef QT_SYMBIAN_SUPPORTS_ADVANCED_POINTER
     void translateAdvancedPointerEvent(const TAdvancedPointerEvent *event);
 #endif
+    void handleClientAreaChange();
 
 private:
     static QSymbianControl *lastFocusedControl;
@@ -269,6 +272,11 @@
     return CCoeEnv::Static()-> AppUi();
 }
 
+inline CEikMenuBar* QS60Data::menuBar()
+{
+    return CEikonEnv::Static()->AppUiFactory()->MenuBar();
+}
+
 #ifdef Q_WS_S60
 inline CEikStatusPane* QS60Data::statusPane()
 {