summaryrefslogtreecommitdiffstats
path: root/doc/src/qnamespace.qdoc
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2009-05-04 15:21:02 (GMT)
committerBradley T. Hughes <bradley.hughes@nokia.com>2009-05-04 15:21:02 (GMT)
commit793d3c2da83098e32063c4ae6df187058103bde8 (patch)
tree7b96581a67bd66ff30b0ede18b0fbfd71d9345cf /doc/src/qnamespace.qdoc
parent2d0f49df3a3c44601bf2e41ea722c2384b71aab0 (diff)
parentc2d47f6717fdccd44838f3c128693a3c09f6cf68 (diff)
downloadQt-793d3c2da83098e32063c4ae6df187058103bde8.zip
Qt-793d3c2da83098e32063c4ae6df187058103bde8.tar.gz
Qt-793d3c2da83098e32063c4ae6df187058103bde8.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.qdoc8
1 files changed, 7 insertions, 1 deletions
diff --git a/doc/src/qnamespace.qdoc b/doc/src/qnamespace.qdoc
index 3045d3f..75bd547 100644
--- a/doc/src/qnamespace.qdoc
+++ b/doc/src/qnamespace.qdoc
@@ -149,7 +149,13 @@
\value AA_MacPluginApplication Stops the a 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.
+ menu and not taking possession of the native menu bar. When setting this
+ attribute to true will alse set the AA_MacDontUseNativeMenuBar attribute
+ to true.
+
+ \value AA_DontUseNativeMenuBar All menubars created while this attribute is
+ set to true won't be used as a native menubar (e.g, the menubar at
+ the top of the main screen on Mac OS X or at the bottom in Windows CE).
\omitvalue AA_AttributeCount
*/