diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-06-10 12:26:12 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-06-10 12:26:12 (GMT) |
| commit | ea953378e71afaa4b6eb7c95bbe2e507b2ab6a7c (patch) | |
| tree | 47a26e1c68b49477a15a383caf6c1c1d0397c276 /src/gui/kernel/qwidget.h | |
| parent | 03b28bf56b2edd76ca55ec6e3702db7bca69e757 (diff) | |
| parent | 1fddb14c4d0ee82ac66c89061e8a20932f961883 (diff) | |
| download | Qt-ea953378e71afaa4b6eb7c95bbe2e507b2ab6a7c.zip Qt-ea953378e71afaa4b6eb7c95bbe2e507b2ab6a7c.tar.gz Qt-ea953378e71afaa4b6eb7c95bbe2e507b2ab6a7c.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/gui/kernel/qwidget.h')
| -rw-r--r-- | src/gui/kernel/qwidget.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget.h b/src/gui/kernel/qwidget.h index 0dd470d..680bbaa 100644 --- a/src/gui/kernel/qwidget.h +++ b/src/gui/kernel/qwidget.h @@ -554,6 +554,9 @@ public: void removeAction(QAction *action); QList<QAction*> actions() const; #endif + const QList<QAction*>& softKeys() const; + void setSoftKey(QAction *softKey); + void setSoftKeys(const QList<QAction*> &softKeys); QWidget *parentWidget() const; @@ -728,6 +731,7 @@ private: friend class QGraphicsProxyWidget; friend class QGraphicsProxyWidgetPrivate; friend class QStyleSheetStyle; + friend class QWidgetExceptionCleaner; #ifdef Q_WS_MAC friend class QCoreGraphicsPaintEnginePrivate; |