diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-06-24 14:25:07 +1000 |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-06-24 14:25:07 +1000 |
| commit | 94d62da58286df177286adcbe688c40629d2c551 (patch) | |
| tree | 773f3b055e77d1947cc4aba6f556630070017848 /doc/src/modules.qdoc | |
| parent | 124f5714e8e6ec1945d536e622b51304f2b32dd7 (diff) | |
| parent | 0570b26f90f031b09970f8fca1a67339b66ee33f (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
mkspecs/features/qt.prf
src/corelib/global/qglobal.h
Diffstat (limited to 'doc/src/modules.qdoc')
| -rw-r--r-- | doc/src/modules.qdoc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc index d47b1e660b..947304f5d3 100644 --- a/doc/src/modules.qdoc +++ b/doc/src/modules.qdoc @@ -55,6 +55,7 @@ \row \o \l{QtGui} \o Graphical user interface (GUI) components \row \o \l{QtNetwork} \o Classes for network programming \row \o \l{QtOpenGL} \o OpenGL support classes + \row \o \l{QtOpenVG} \o OpenVG support classes \row \o \l{QtScript} \o Classes for evaluating Qt Scripts \row \o \l{QtScriptTools} \o Additional Qt Script components \row \o \l{QtSql} \o Classes for database integration using SQL |