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 /src/gui/kernel/qaction.cpp | |
| 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 'src/gui/kernel/qaction.cpp')
| -rw-r--r-- | src/gui/kernel/qaction.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qaction.cpp b/src/gui/kernel/qaction.cpp index c6addc1..b2afbd0 100644 --- a/src/gui/kernel/qaction.cpp +++ b/src/gui/kernel/qaction.cpp @@ -1370,7 +1370,7 @@ QAction::MenuRole QAction::menuRole() const void QAction::setIconVisibleInMenu(bool visible) { Q_D(QAction); - if (visible != (bool)d->iconVisibleInMenu) { + if (d->iconVisibleInMenu == -1 || visible != bool(d->iconVisibleInMenu)) { int oldValue = d->iconVisibleInMenu; d->iconVisibleInMenu = visible; // Only send data changed if we really need to. |