1 files changed, 12 insertions, 2 deletions
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h
index c4ce2ea..dc8ea6c 100644
--- a/src/gui/kernel/qapplication_p.h
+++ b/src/gui/kernel/qapplication_p.h
@@ -100,6 +100,7 @@ extern QSysInfo::MacVersion qt_macver;
 #if defined(Q_WS_QWS)
 class QWSManager;
 class QDirectPainter;
+struct QWSServerCleaner { ~QWSServerCleaner(); };
 #endif
 
 #ifndef QT_NO_TABLET
@@ -296,8 +297,8 @@ public:
     static void emitLastWindowClosed();
 #ifdef Q_WS_WINCE
     static int autoMaximizeThreshold;
-    static bool autoSipEnabled;
 #endif
+    static bool autoSipEnabled;
     static QString desktopStyleKey();
 
     static QGraphicsSystem *graphicsSystem()
@@ -309,7 +310,6 @@ public:
 
     void createEventDispatcher();
     QString appName() const;
-
     static void dispatchEnterLeave(QWidget *enter, QWidget *leave);
 
     //modality
@@ -346,6 +346,7 @@ public:
         KB_KDE = 8,
         KB_Gnome = 16,
         KB_CDE = 32,
+        KB_S60 = 64,
         KB_All = 0xffff
     };
 
@@ -431,6 +432,7 @@ public:
     static bool fade_tooltip;
     static bool animate_toolbox;
     static bool widgetCount; // Coupled with -widgetcount switch
+    static bool auto_sip_on_mouse_focus;
 #ifdef Q_WS_MAC
     static bool native_modal_dialog_active;
 #endif
@@ -458,6 +460,7 @@ public:
 
 #ifdef Q_WS_QWS
     QPointer<QWSManager> last_manager;
+    QWSServerCleaner qwsServerCleaner;
 # ifndef QT_NO_DIRECTPAINTER
     QMap<WId, QDirectPainter *> *directPainters;
 # endif
@@ -497,6 +500,9 @@ public:
     static bool sendMouseEvent(QWidget *receiver, QMouseEvent *event, QWidget *alienWidget,
                                QWidget *native, QWidget **buttonDown, QPointer<QWidget> &lastMouseReceiver,
                                bool spontaneous = true);
+#ifdef Q_OS_SYMBIAN
+    static TUint resolveS60ScanCode(TInt scanCode, TUint keysym);
+#endif
 #if defined(Q_WS_WIN) || defined(Q_WS_X11)
     void sendSyntheticEnterLeave(QWidget *widget);
 #endif
@@ -560,6 +566,10 @@ private:
     QMap<const QScreen*, QRect> maxWindowRects;
 #endif
 
+#ifdef Q_OS_SYMBIAN
+    static QHash<TInt, TUint> scanCodeCache;
+#endif
+
     static QApplicationPrivate *self;
 
     static void giveFocusAccordingToFocusPolicy(QWidget *w,