diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-11-09 17:43:42 +1000 |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-11-09 17:43:42 +1000 |
| commit | d2bcb0dfbc79c382dad87d3d2154ca127ae8fc16 (patch) | |
| tree | c0848d1fc8fd2215fe32d75dcbe86354b0344282 /doc/src/modules.qdoc | |
| parent | dbbe24f0f04e5a0aaf9223b73bee873e208a1fa7 (diff) | |
| parent | b8b7f98b01d9ad03fecac7a0f593ac5734d7af1d (diff) | |
Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declarativeui
Conflicts:
configure.exe
src/corelib/animation/qabstractanimation.cpp
src/gui/graphicsview/qgraphicsview.cpp
src/s60installs/s60installs.pro
tools/configure/configureapp.cpp
tools/qdoc3/node.h
Diffstat (limited to 'doc/src/modules.qdoc')
| -rw-r--r-- | doc/src/modules.qdoc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc index 6f6e7bdde1..e57b271baa 100644 --- a/doc/src/modules.qdoc +++ b/doc/src/modules.qdoc @@ -227,10 +227,11 @@ The QtOpenGL module is part of the \l{Qt Full Framework Edition} and the \l{Open Source Versions of Qt}. It is available on Windows, X11, and Mac OS X. - \l{Qt for Embedded Linux} supports OpenGL ES (OpenGL for Embedded Systems). - To be able to use the OpenGL API in \l{Qt for Embedded Linux}, it must be + \l{Qt for Embedded Linux and OpenGL} supports OpenGL ES (OpenGL for Embedded Systems). + \note To be able to use the OpenGL API in \l{Qt for Embedded Linux}, it must be integrated with the Q Window System (QWS). See the \l{Qt for Embedded Linux and OpenGL} documentation for details. + */ /*! |