summaryrefslogtreecommitdiffstats
path: root/doc/src/platforms/platform-notes.qdoc
diff options
context:
space:
mode:
authorJyri Tahtela <jyri.tahtela@nokia.com>2011-05-19 13:56:55 (GMT)
committerJyri Tahtela <jyri.tahtela@nokia.com>2011-05-19 13:56:55 (GMT)
commit94051a438e64eaede021b4e926ef58f793a09a70 (patch)
tree9860dc49d8e6453df356f51da9126b583ac35206 /doc/src/platforms/platform-notes.qdoc
parent06557b8d7c472c6298f7d8b310feda225864265f (diff)
parent35b5f15c3fe5c2f1f0d046d09b9d95dee3bb91b5 (diff)
downloadQt-94051a438e64eaede021b4e926ef58f793a09a70.zip
Qt-94051a438e64eaede021b4e926ef58f793a09a70.tar.gz
Qt-94051a438e64eaede021b4e926ef58f793a09a70.tar.bz2
Merge remote-tracking branch 'qt/4.8'
Diffstat (limited to 'doc/src/platforms/platform-notes.qdoc')
-rw-r--r--doc/src/platforms/platform-notes.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc
index ebee54b..c2e47c2 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