--- a/src/gui/kernel/qsoftkeymanager_p.h	Fri Feb 19 23:40:16 2010 +0200
+++ b/src/gui/kernel/qsoftkeymanager_p.h	Fri Mar 12 15:46:37 2010 +0200
@@ -63,6 +63,8 @@
 
 class QSoftKeyManagerPrivate;
 
+const char MENU_ACTION_PROPERTY[] = "_q_menuaction";
+
 class Q_AUTOTEST_EXPORT QSoftKeyManager : public QObject
 {
     Q_OBJECT
@@ -79,26 +81,30 @@
     };
 
     static void updateSoftKeys();
+#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);
 
-#ifdef Q_WS_S60
-    static bool handleCommand(int);
-#endif
+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