diff options
author | Norwegian Rock Cat <qt-info@nokia.com> | 2009-04-22 11:42:34 (GMT) |
---|---|---|
committer | Norwegian Rock Cat <qt-info@nokia.com> | 2009-05-04 13:09:59 (GMT) |
commit | 1e0e67406c3865717fef8b98d2c69adbefc54245 (patch) | |
tree | e26996ae282fee233e12e7674373bc5c9336a8d4 /doc | |
parent | 4ac548735b1a62b2db344b5ee4ecc14207f1111d (diff) | |
download | Qt-1e0e67406c3865717fef8b98d2c69adbefc54245.zip Qt-1e0e67406c3865717fef8b98d2c69adbefc54245.tar.gz Qt-1e0e67406c3865717fef8b98d2c69adbefc54245.tar.bz2 |
Deprecate qt_mac_set_show_menubar for a public cross-platform API.
I'm tired of these "hidden" functions. We have an
AA_MacPluginApplication, but sometimes you may have a legitimate reason
for setting this outside of "plugin applications." In the footsteps of
the menu icon attribute, the attribute is the main leader, but menubars
can disable/enable this locally the new QMenuBar::setNativeMenuBar()
property. Otherwise, the menubars take their que from the application
attribute.
This also works for Windows CE. So, there is a bit on convergence as
well.
Task-number: 236757
Diffstat (limited to 'doc')
-rw-r--r-- | doc/src/exportedfunctions.qdoc | 3 | ||||
-rw-r--r-- | doc/src/qnamespace.qdoc | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/doc/src/exportedfunctions.qdoc b/doc/src/exportedfunctions.qdoc index f67950c..b421086 100644 --- a/doc/src/exportedfunctions.qdoc +++ b/doc/src/exportedfunctions.qdoc @@ -129,6 +129,9 @@ on Mac OS X or be part of the main window. This feature is on by default. + In Qt 4.6, this is equivalent to + \c { QApplication::instance()->setAttribute(Qt::AA_MacDontUseNativeMenuBar); }. + \section1 void qt_mac_set_press_and_hold_context(bool \e{enable}) Turns emulation of the right mouse button by clicking and holding diff --git a/doc/src/qnamespace.qdoc b/doc/src/qnamespace.qdoc index 9ea6b52..8a1e5e6 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 */ |