diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-07-02 03:40:10 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-07-02 03:40:10 (GMT) |
| commit | fcfeee14047b87eeb4de49188a997fbfeed73773 (patch) | |
| tree | 8e5f732783a90b2187728f5e955efb11304a420c /doc/src/index.qdoc | |
| parent | 8aba610c22c44bf36eb2e539a06b65753c48bbc2 (diff) | |
| parent | 6c9647f6673fd5738001c5bbe416b116442fbc41 (diff) | |
| download | Qt-fcfeee14047b87eeb4de49188a997fbfeed73773.zip Qt-fcfeee14047b87eeb4de49188a997fbfeed73773.tar.gz Qt-fcfeee14047b87eeb4de49188a997fbfeed73773.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
configure.exe
src/gui/kernel/qevent.cpp
src/gui/kernel/qevent_p.h
tools/qdoc3/codemarker.cpp
tools/qdoc3/cppcodemarker.cpp
tools/qdoc3/generator.cpp
Diffstat (limited to 'doc/src/index.qdoc')
| -rw-r--r-- | doc/src/index.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index 0ca1975..b59523e 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -152,7 +152,6 @@ <li><a href="qt-embedded.html">Qt for Embedded Platforms</a></li> <li><a href="overviews.html">All Overviews and HOWTOs</a></li> <li><a href="gallery.html">Qt Widget Gallery</a></li> - <li><a href="http://doc.trolltech.com/extras/qt43-class-chart.pdf">Class Chart</a></li> <li><a href="qtglobal.html">Qt Global Declarations</a></li> </ul> </td> @@ -181,6 +180,7 @@ <li><a href="qthelp.html">Help Module</a></li> <li><a href="qtnetwork.html">Network Module</a></li> <li><a href="qtopengl.html">OpenGL Module</a></li> + <li><a href="qtopenvg.html">OpenVG Module</a></li> <li><a href="qtscript.html">Script Module</a></li> <li><a href="qtsql.html">SQL Module</a></li> <li><a href="qtsvg.html">SVG Module</a></li> |