diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-11-10 18:15:09 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-11-10 18:15:09 (GMT) |
| commit | cd4cab01810b817cdf8eb80ab9fc3174a798dd10 (patch) | |
| tree | a849171a850e91851e871544d1e49a56484d37c7 /doc/src/modules.qdoc | |
| parent | d895af5713a7b7ee011b2b29cb5844fbf964df5e (diff) | |
| parent | 7005ca9f0f6b1e535ad2b26d3fcf46dffacc3f13 (diff) | |
| download | Qt-cd4cab01810b817cdf8eb80ab9fc3174a798dd10.zip Qt-cd4cab01810b817cdf8eb80ab9fc3174a798dd10.tar.gz Qt-cd4cab01810b817cdf8eb80ab9fc3174a798dd10.tar.bz2 | |
Merge branch '4.6'
Conflicts:
src/gui/styles/qcommonstyle.cpp
tools/assistant/lib/lib.pro
tools/assistant/lib/qhelp_global.cpp
tools/assistant/tools/assistant/assistant.qch
tools/assistant/tools/assistant/mainwindow.cpp
Diffstat (limited to 'doc/src/modules.qdoc')
| -rw-r--r-- | doc/src/modules.qdoc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc index d28c2bc..457d8da 100644 --- a/doc/src/modules.qdoc +++ b/doc/src/modules.qdoc @@ -226,10 +226,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. + */ /*! @@ -367,6 +368,9 @@ The QtSql module is part of the \l{Qt Full Framework Edition} and the \l{Open Source Versions of Qt}. + + See the \l{SQL Programming} guide for information about using this + module in your applications. */ /*! @@ -576,7 +580,7 @@ the module under the appropriate version of the GNU LGPL; version 2.1 for applications and libraries licensed under the GNU GPL version 2, or version 3 for applications and libraries licensed under the GNU - GPL version 2. + GPL version 3. \legalese This file is part of the KDE project |