1 files changed, 21 insertions, 3 deletions
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
index 2461820..d5f1b98 100644
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
@@ -79,6 +79,13 @@
 #include "QtGui/qscreen_qws.h"
 #endif
 
+#if defined(Q_WS_S60)
+class RDrawableWindow;
+class CCoeControl;
+class CAknTitlePane;
+class CAknContextPane;
+#endif
+
 QT_BEGIN_NAMESPACE
 
 // Extra QWidget data
@@ -142,6 +149,10 @@ struct QTLWExtra {
     uint isMove : 1;
     uint embedded : 1;
 #endif
+#if defined(Q_WS_S60)
+    uint activated : 1; // RWindowBase::Activated has been called
+    RDrawableWindow *rwindow;
+#endif
 #if defined(Q_WS_QWS) && !defined (QT_NO_QWS_MANAGER)
     QWSManager *qwsManager;
 #endif
@@ -261,6 +272,10 @@ public:
     void applyMaxAndMinSizeOnWindow();
 #endif
 
+#ifdef Q_WS_S60
+    void s60UpdateIsOpaque();
+#endif
+
     void raise_sys();
     void lower_sys();
     void stackUnder_sys(QWidget *);
@@ -365,7 +380,7 @@ public:
     void x11UpdateIsOpaque();
 #endif
 
-#if defined (Q_WS_WIN)
+#if defined (Q_WS_WIN) || defined (Q_WS_S60)
     void reparentChildren();
 #endif
 
@@ -596,7 +611,9 @@ public:
     uint isGLWidget : 1;
 #endif
 
-#if defined(Q_WS_X11) || defined (Q_WS_WIN) || defined(Q_WS_MAC)
+    Qt::InputMethodHints imHints;
+
+#if defined(Q_WS_X11) || defined (Q_WS_WIN) || defined(Q_WS_MAC) || defined(Q_WS_S60)
 #ifdef Q_WS_MAC
     void setWSGeometry(bool dontShow=false, const QRect &oldRect = QRect());
 #else
@@ -624,7 +641,7 @@ public:
     QSizePolicy size_policy;
     QLocale locale;
 
-#ifdef Q_WS_X11
+#if defined(Q_WS_X11) || defined(Q_WS_S60)
     static QWidget *mouseGrabber;
     static QWidget *keyboardGrabber;
 #endif
@@ -669,6 +686,7 @@ public:
     }
 
     QSize adjustedSize() const;
+      
 };
 
 inline QWExtra *QWidgetPrivate::extraData() const