diff options
author | Thomas Zander <t.zander@nokia.com> | 2010-05-19 13:52:54 (GMT) |
---|---|---|
committer | Thomas Zander <t.zander@nokia.com> | 2010-05-19 13:52:54 (GMT) |
commit | 14ddb8172cce8c90f01436ab8215cc8ed594e251 (patch) | |
tree | 04e860f80d7f3e9773996b62d4c56ad92497a096 /src/gui/widgets/qmenubar.cpp | |
parent | 6bdba9c7909d8f53e28823b16e82f89650eea16d (diff) | |
parent | de0858687898f6e0e54cce3f986779c7aa1a350e (diff) | |
download | Qt-14ddb8172cce8c90f01436ab8215cc8ed594e251.zip Qt-14ddb8172cce8c90f01436ab8215cc8ed594e251.tar.gz Qt-14ddb8172cce8c90f01436ab8215cc8ed594e251.tar.bz2 |
Merge commit 'remotes/origin/4.7' into symbian47
Conflicts:
src/gui/kernel/qapplication_s60.cpp
Diffstat (limited to 'src/gui/widgets/qmenubar.cpp')
-rw-r--r-- | src/gui/widgets/qmenubar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp index ef37fd1..aa4ffce 100644 --- a/src/gui/widgets/qmenubar.cpp +++ b/src/gui/widgets/qmenubar.cpp @@ -1956,7 +1956,7 @@ bool QMenuBar::isNativeMenuBar() const to the right soft key. Currently there is only support for the default action on Windows - Mobile. All other platforms ignore the default action. + Mobile. On all other platforms this method is not available. \sa defaultAction() */ |