diff options
| author | axis <qt-info@nokia.com> | 2010-02-16 11:53:07 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-16 11:53:07 (GMT) |
| commit | 15b08dffc1354bc816b04901a7442679382b0935 (patch) | |
| tree | 783af85b75f9de3ab10902c5ba66cf5e22b2fe61 /doc/src/modules.qdoc | |
| parent | 9f5b02406f38fe02a27de7843b9f8a11232d2064 (diff) | |
| parent | 9d174f13e48730ac06aa429e0f011a02b333025e (diff) | |
| download | Qt-15b08dffc1354bc816b04901a7442679382b0935.zip Qt-15b08dffc1354bc816b04901a7442679382b0935.tar.gz Qt-15b08dffc1354bc816b04901a7442679382b0935.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public
Conflicts:
configure
mkspecs/common/symbian/symbian.conf
mkspecs/features/symbian/application_icon.prf
qmake/generators/makefile.cpp
qmake/generators/symbian/initprojectdeploy_symbian.cpp
qmake/generators/symbian/symmake.cpp
tools/assistant/tools/assistant/assistant.pro
Diffstat (limited to 'doc/src/modules.qdoc')
| -rw-r--r-- | doc/src/modules.qdoc | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc index 44d6ed6..78af7eb 100644 --- a/doc/src/modules.qdoc +++ b/doc/src/modules.qdoc @@ -65,6 +65,7 @@ \row \o \l{QtWebKit} \o Classes for displaying and editing Web content \row \o \l{QtXml} \o Classes for handling XML \row \o \l{QtXmlPatterns} \o An XQuery & XPath engine for XML and custom data models + \row \o \l{QtDeclarative} \o An engine for declaratively building fluid user interfaces. \row \o \l{Phonon Module}{Phonon} \o Multimedia framework classes \row \o \l{Qt3Support} \o Qt 3 compatibility classes \header \o {2,1} \bold{Modules for working with Qt's tools} @@ -1080,13 +1081,3 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." \endlegalese */ - -/*! - \page qtassistant.html - \title QtAssistant - - This module is no longer needed. Use the QtHelp module to integrate documentation - into your application. - - \sa {QtHelp} -*/ |