diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-05 08:18:26 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-05 08:18:26 (GMT) |
| commit | 3383ca416a52e89acd251e9e0a2c92283d1eba2c (patch) | |
| tree | 816f4cb2d16d8ef64645ef1b4078085bc91dc655 /doc/src/qnamespace.qdoc | |
| parent | 793d3c2da83098e32063c4ae6df187058103bde8 (diff) | |
| parent | 4baa045b77ef98f269bec4cab410229a89e644c5 (diff) | |
| download | Qt-3383ca416a52e89acd251e9e0a2c92283d1eba2c.zip Qt-3383ca416a52e89acd251e9e0a2c92283d1eba2c.tar.gz Qt-3383ca416a52e89acd251e9e0a2c92283d1eba2c.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-multitouch
Diffstat (limited to 'doc/src/qnamespace.qdoc')
| -rw-r--r-- | doc/src/qnamespace.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/qnamespace.qdoc b/doc/src/qnamespace.qdoc index 75bd547..98f7e7c 100644 --- a/doc/src/qnamespace.qdoc +++ b/doc/src/qnamespace.qdoc @@ -146,11 +146,11 @@ widgets stay non-native unless specifically set by the Qt::WA_NativeWindow attribute. - \value AA_MacPluginApplication Stops the a Qt mac application from doing + \value AA_MacPluginApplication Stops the Qt mac application from doing specific initializations that do not necessarily make sense when using Qt to author a plugin. This includes avoiding loading our nib for the main menu and not taking possession of the native menu bar. When setting this - attribute to true will alse set the AA_MacDontUseNativeMenuBar attribute + attribute to true will also set the AA_DontUseNativeMenuBar attribute to true. \value AA_DontUseNativeMenuBar All menubars created while this attribute is |