diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2009-11-09 12:03:20 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2009-11-09 12:03:20 (GMT) |
| commit | cf417f787454f131f35248bb0c1294dadd777b45 (patch) | |
| tree | e5ad2f54887aa695c6f66ae2c305ab75ccabdac0 /src/gui/kernel/qwidget.cpp | |
| parent | a7577f8c3ae3a025384d8d19fdf3575ef141a70b (diff) | |
| parent | e07878a9bcccbf063650272329c0aca14290b8e3 (diff) | |
| download | Qt-cf417f787454f131f35248bb0c1294dadd777b45.zip Qt-cf417f787454f131f35248bb0c1294dadd777b45.tar.gz Qt-cf417f787454f131f35248bb0c1294dadd777b45.tar.bz2 | |
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 271b939..f856b13 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -900,7 +900,7 @@ void QWidget::setAutoFillBackground(bool enabled) passing a \c QAction with a softkey role set on it. When the widget containing the softkey actions has focus, its softkeys should appear in the user interface. Softkeys are discovered by traversing the widget - heirarchy so it is possible to define a single set of softkeys that are + hierarchy so it is possible to define a single set of softkeys that are present at all times by calling addAction() for a given top level widget. On some platforms, this concept overlaps with \c QMenuBar such that if no |