summaryrefslogtreecommitdiffstats
path: root/doc/src/platforms/platform-notes.qdoc
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@nokia.com>2011-04-04 08:47:28 (GMT)
committerRichard Moe Gustavsen <richard.gustavsen@nokia.com>2011-04-04 08:49:02 (GMT)
commitb240f8a2ee3b7ff82a389fbf5dfd076792f385e8 (patch)
tree50febb03d2e84e9f024e50c2ab6fa2611f9861fa /doc/src/platforms/platform-notes.qdoc
parent90b4cf4b1aa0f70a62118e200e76dc1dc57985cc (diff)
downloadQt-b240f8a2ee3b7ff82a389fbf5dfd076792f385e8.zip
Qt-b240f8a2ee3b7ff82a389fbf5dfd076792f385e8.tar.gz
Qt-b240f8a2ee3b7ff82a389fbf5dfd076792f385e8.tar.bz2
Doc: update platform notes on Mac to reflect WA_MacNoCocoaChildWindow
Diffstat (limited to 'doc/src/platforms/platform-notes.qdoc')
-rw-r--r--doc/src/platforms/platform-notes.qdoc4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc
index 113ad86..88e5ae9 100644
--- a/doc/src/platforms/platform-notes.qdoc
+++ b/doc/src/platforms/platform-notes.qdoc
@@ -612,7 +612,7 @@
Qt::WA_MacNormalSize, Qt::WA_MacSmallSize, Qt::WA_MacMiniSize, Qt::WA_MacVariableSize,
Qt::WA_MacBrushedMetal, Qt::WA_MacAlwaysShowToolWindow, Qt::WA_MacFrameworkScaled,
Qt::WA_MacNoShadow, Qt::Sheet, Qt::Drawer, Qt::MacWindowToolBarButtonHint,
- QMainWindow::unifiedTitleAndToolBarOnMac
+ QMainWindow::unifiedTitleAndToolBarOnMac, WA_MacNoCocoaChildWindow
\section2 Mixing Qt with native code
Two classes are awailable for either adding native Cocoa views/controls
@@ -630,7 +630,7 @@
we need to do special bookkeeping in Qt to handle this correctly, which
unfortunately make mixing in native panels hard. The best way at the moment
to do this, is to follow the pattern below, where we post the call to the
- function with native code rather than calling it directly. Then we now that
+ function with native code rather than calling it directly. Then we know that
Qt has cleanly updated any pending event loop recursions before the native
panel is shown: