diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-06 10:34:57 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-06 10:34:57 (GMT) |
| commit | 09334abffdccb5c20de4e6393bd207ac3d202c8c (patch) | |
| tree | 1df7cc1afbfa578c7632a0570c892677685957bb | |
| parent | 6ad3d72032687ccc88cba3829216165d375f81ec (diff) | |
| parent | d1b26ff2182d5a2b943ef85c406570c45781ae03 (diff) | |
| download | Qt-09334abffdccb5c20de4e6393bd207ac3d202c8c.zip Qt-09334abffdccb5c20de4e6393bd207ac3d202c8c.tar.gz Qt-09334abffdccb5c20de4e6393bd207ac3d202c8c.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
Doc: removed documentation of a no longer used attribute
| -rw-r--r-- | doc/src/platforms/platform-notes.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc index 88e5ae9..bb05c92 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, WA_MacNoCocoaChildWindow + QMainWindow::unifiedTitleAndToolBarOnMac \section2 Mixing Qt with native code Two classes are awailable for either adding native Cocoa views/controls |