summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkku Luukkainen <markku.luukkainen@digia.com>2009-06-08 07:08:56 (GMT)
committerMarkku Luukkainen <markku.luukkainen@digia.com>2009-06-08 07:08:56 (GMT)
commit542bef5b03eb0492b0625c84db771fbd29f5cf70 (patch)
treeb7d41bff2fe4c2405fa67914b50bfe1ddb2fdaa3
parent16663479c6fb57bf1e734d0dc1c1a92c7f2fb3e5 (diff)
parent7661082e4c1851ab2fd6409d8689dc8b08d793b9 (diff)
downloadQt-542bef5b03eb0492b0625c84db771fbd29f5cf70.zip
Qt-542bef5b03eb0492b0625c84db771fbd29f5cf70.tar.gz
Qt-542bef5b03eb0492b0625c84db771fbd29f5cf70.tar.bz2
Merge branch 'softkeys_without_stack' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into softkeys_without_stack
-rw-r--r--src/gui/kernel/qwidget.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index c592c57..9d4f176 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -4880,6 +4880,13 @@ void QWidget::render(QPainter *painter, const QPoint &targetOffset,
d->extra->inRenderWithPainter = false;
}
+#if !defined(Q_WS_S60)
+void QWidgetPrivate::setNativeSoftKeys(const QList<QAction*> &softkeys)
+{
+ Q_UNUSED(softkeys)
+}
+#endif // !defined(Q_WS_S60)
+
bool QWidgetPrivate::isAboutToShow() const
{
if (data.in_show)