diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-08-28 15:51:22 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-08-28 15:51:22 +0200 |
| commit | 31a0ef1d1dd55096652c1c4f0501fce2937a1b23 (patch) | |
| tree | f728a2e5829e26ed75bfd465d07b336fc77e599f /src/gui/kernel/qwidget.cpp | |
| parent | 7c2620578ba0698a14c1d4ff5c7a4e260f06ad31 (diff) | |
| parent | bd3cd571ac061b0ed0e8c001c90c4edeafae67d7 (diff) | |
| download | qt4-tools-31a0ef1d1dd55096652c1c4f0501fce2937a1b23.tar.gz | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/kernel/qwidget.cpp')
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index fb5f9340be..38b09ee777 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -11846,10 +11846,9 @@ const QList<QAction*>& QWidget::softKeys() const \preliminary \since 4.6 - Sets the softkey \a softkey to this widget's list of softkeys, + Sets the softkey \a softKey to this widget's list of softkeys. Setting 0 as softkey will clear all the existing softkeys set - to the widget - A QWidget can have 0 or more softkeys + to the widget. A QWidget can have 0 or more softkeys. \sa softKeys(), setSoftKeys() */ @@ -11866,8 +11865,8 @@ void QWidget::setSoftKey(QAction *softKey) } /*! - Sets the list of softkeys \a softkeys to this widget's list of softkeys, - A QWidget can have 0 or more softkeys + Sets the list of softkeys \a softKeys to this widget's list of softkeys. + A QWidget can have 0 or more softkeys. \sa softKeys(), setSoftKey() */ |