--- a/src/gui/kernel/qsoftkeymanager_p.h	Tue Feb 02 00:43:10 2010 +0200
+++ b/src/gui/kernel/qsoftkeymanager_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)
 **
@@ -63,6 +63,9 @@
 
 class QSoftKeyManagerPrivate;
 
+const char MENU_ACTION_PROPERTY[] = "_q_menuAction";
+const char FORCE_ENABLED_PROPERTY[] = "_q_forceEnabledInSoftkeys";
+
 class Q_AUTOTEST_EXPORT QSoftKeyManager : public QObject
 {
     Q_OBJECT
@@ -79,26 +82,32 @@
     };
 
     static void updateSoftKeys();
-    static QAction *createAction(StandardSoftKey standardKey, QWidget *actionWidget);
-    static QAction *createKeyedAction(StandardSoftKey standardKey, Qt::Key key, QWidget *actionWidget);
-
 #ifdef Q_WS_S60
     static bool handleCommand(int);
 #endif
 
+    static QAction *createAction(StandardSoftKey standardKey, QWidget *actionWidget);
+    static QAction *createKeyedAction(StandardSoftKey standardKey, Qt::Key key, QWidget *actionWidget);
+    static QString standardSoftKeyText(StandardSoftKey standardKey);
+    static void setForceEnabledInSoftkeys(QAction *action);
+    static bool isForceEnabledInSofkeys(QAction *action);
+
+protected:
+    bool event(QEvent *e);
+
 private:
     QSoftKeyManager();
     static QSoftKeyManager *instance();
-    static const char *standardSoftKeyText(StandardSoftKey standardKey);
-
-protected:
-    bool event(QEvent *e);
-
-    Q_DISABLE_COPY(QSoftKeyManager)
+    bool appendSoftkeys(const QWidget &source, int level);
+    QWidget *softkeySource(QWidget *previousSource, bool& recursiveMerging);
+    bool handleUpdateSoftKeys();
 
 private Q_SLOTS:
     void cleanupHash(QObject* obj);
     void sendKeyEvent();
+
+private:
+    Q_DISABLE_COPY(QSoftKeyManager)
 };
 
 QT_END_NAMESPACE