Merge branch 'softkeys' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into softkeys

2 files changed, 20 insertions, 13 deletions

diff --git a/src/gui/widgets/qsoftkeystack.cpp b/src/gui/widgets/qsoftkeystack.cpp
index cd17171..ae58e8d 100644
--- a/src/gui/widgets/qsoftkeystack.cpp
+++ b/src/gui/widgets/qsoftkeystack.cpp
@@ -129,8 +129,8 @@ void QSoftKeyStack::handleFocusChanged(QWidget *old, QWidget *now)
     Qt::ContextMenuPolicy policy = now->contextMenuPolicy();
     if (policy != Qt::NoContextMenu && policy != Qt::PreventContextMenu ) {
         QList<QSoftKeyAction*> actionList;
-        QSoftKeyAction* menu = new QSoftKeyAction(QSoftKeyAction::Menu, QString("Menu"), now);
-        QSoftKeyAction* contextMenu = new QSoftKeyAction(QSoftKeyAction::ContextMenu, QString("ContextMenu"), now);
+        QSoftKeyAction* menu = new QSoftKeyAction(QSoftKeyAction::Menu, QString::fromLatin1("Menu"), now);
+        QSoftKeyAction* contextMenu = new QSoftKeyAction(QSoftKeyAction::ContextMenu, QString::fromLatin1("ContextMenu"), now);
         actionList.append(menu);
         actionList.append(contextMenu);
         softKeyStack->push(actionList);
@@ -164,3 +164,14 @@ void QSoftKeyStack::handleSoftKeyPress(int command)
     Q_D(QSoftKeyStack);
     d->handleSoftKeyPress(command);
 }
+
+#if !defined(Q_WS_S60)
+void QSoftKeyStackPrivate::handleSoftKeyPress(int command)
+{
+    Q_UNUSED(command)
+}
+
+void QSoftKeyStackPrivate::setNativeSoftKeys()
+{
+}
+#endif // !defined(Q_WS_S60)
\ No newline at end of file
diff --git a/src/gui/widgets/widgets.pri b/src/gui/widgets/widgets.pri
index c9e68a1..0c0641a 100644
--- a/src/gui/widgets/widgets.pri
+++ b/src/gui/widgets/widgets.pri
@@ -78,8 +78,10 @@ HEADERS += \
         widgets/qtoolbararealayout_p.h \
         widgets/qplaintextedit.h \
         widgets/qplaintextedit_p.h \
-        widgets/qprintpreviewwidget.h
-
+        widgets/qprintpreviewwidget.h \
+        widgets/qsoftkeyaction.h \
+        widgets/qsoftkeystack.h \
+        widgets/qsoftkeystack_p.h
 SOURCES += \
         widgets/qabstractbutton.cpp \
         widgets/qabstractslider.cpp \
@@ -138,8 +140,9 @@ SOURCES += \
         widgets/qwidgetanimator.cpp \
         widgets/qtoolbararealayout.cpp \
         widgets/qplaintextedit.cpp \
-        widgets/qprintpreviewwidget.cpp
-
+        widgets/qprintpreviewwidget.cpp \
+        widgets/qsoftkeyaction.cpp \
+        widgets/qsoftkeystack.cpp
 
 !embedded:mac {
     HEADERS += widgets/qmacnativewidget_mac.h \
@@ -162,14 +165,7 @@ wince*: {
 }
 
 symbian*: {
-    HEADERS += \
-        widgets/qsoftkeyaction.h \
-        widgets/qsoftkeystack.h \
-        widgets/qsoftkeystack_p.h
-
     SOURCES += \
         widgets/qmenu_symbian.cpp \
-        widgets/qsoftkeyaction.cpp \
-        widgets/qsoftkeystack.cpp \
         widgets/qsoftkeystack_s60.cpp
 }