diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-01 06:34:29 (GMT) |
---|---|---|
committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-01 06:56:50 (GMT) |
commit | 394b7ae6421afb0e309b6207fa2b1fce2e44426e (patch) | |
tree | 1b978136d45f813288ede835fdcdeb008b34cadf /src/gui/kernel/qwidget_mac.mm | |
parent | dc1cab966938edc5463f26189607ece134549a22 (diff) | |
parent | 26af4d54ea4f3a48d053038f34a00aa1119a585b (diff) | |
download | Qt-394b7ae6421afb0e309b6207fa2b1fce2e44426e.zip Qt-394b7ae6421afb0e309b6207fa2b1fce2e44426e.tar.gz Qt-394b7ae6421afb0e309b6207fa2b1fce2e44426e.tar.bz2 |
Merge commit 'origin/4.6' into oslo1-master
Conflicts:
src/gui/kernel/qeventdispatcher_mac.mm
src/gui/kernel/qt_cocoa_helpers_mac.mm
src/gui/widgets/qmenu_mac.mm
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
Diffstat (limited to 'src/gui/kernel/qwidget_mac.mm')
-rw-r--r-- | src/gui/kernel/qwidget_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index 3ff46f5..43b945e 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -404,7 +404,7 @@ inline static void qt_mac_set_fullscreen_mode(bool b) return; qt_mac_app_fullscreen = b; if (b) { - SetSystemUIMode(kUIModeAllSuppressed, 0); + SetSystemUIMode(kUIModeAllHidden, kUIOptionAutoShowMenuBar); } else { SetSystemUIMode(kUIModeNormal, 0); } |