diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-05-27 23:25:07 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-05-27 23:25:07 (GMT) |
| commit | fb2e33b21557412ae7bde009662ca89870407f5f (patch) | |
| tree | 61e7765a4e644d12a0addc21a0bf63e13e992cb9 /doc/src/index.qdoc | |
| parent | d53e4499f864719446abdb7fdeff433dbb3f7d98 (diff) | |
| parent | fcfdccc03b6dd26a82e87a6b6a0ca48d67f78cf6 (diff) | |
| download | Qt-fb2e33b21557412ae7bde009662ca89870407f5f.zip Qt-fb2e33b21557412ae7bde009662ca89870407f5f.tar.gz Qt-fb2e33b21557412ae7bde009662ca89870407f5f.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
mkspecs/features/qt.prf
src/corelib/animation/qanimationgroup.cpp
src/corelib/animation/qparallelanimationgroup.cpp
src/corelib/animation/qpauseanimation.cpp
src/corelib/animation/qpropertyanimation.cpp
src/corelib/animation/qsequentialanimationgroup.cpp
src/corelib/kernel/kernel.pri
src/corelib/kernel/qvariant_p.h
src/corelib/tools/qeasingcurve.cpp
src/gui/graphicsview/qgraphicsitem.cpp
src/opengl/opengl.pro
src/opengl/qgl_x11egl.cpp
tests/auto/auto.pro
Diffstat (limited to 'doc/src/index.qdoc')
| -rw-r--r-- | doc/src/index.qdoc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index f0debdb..2d64dfe 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -153,6 +153,7 @@ <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> <td valign="top"> @@ -208,10 +209,10 @@ <td valign="top"> <ul> <li><a href="http://www.qtsoftware.com/products/add-on-products">Qt Solutions</a></li> - <li><a href="http://www.qtsoftware.com/products/qt/3rdparty/">Partner Add-ons</a></li> + <li><a href="http://www.qtsoftware.com/products/appdev">Partner Add-ons</a></li> <li><a href="http://qt-apps.org">Third-Party Qt Components (qt-apps.org)</a></li> - <li><a href="http://www.qtsoftware.com/support/">Support</a></li> - <li><a href="http://www.qtsoftware.com/support/training/">Training</a></li> + <li><a href="http://www.qtsoftware.com/support-services/support-services/">Support</a></li> + <li><a href="http://www.qtsoftware.com/support-services/training/">Training</a></li> </ul> </td> <td valign="top"> |