Ignore:
Timestamp:
May 5, 2011, 5:36:53 AM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/doc/src/modules.qdoc

    r769 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    77** This file is part of the documentation of the Qt Toolkit.
    88**
    9 ** $QT_BEGIN_LICENSE:LGPL$
     9** $QT_BEGIN_LICENSE:FDL$
    1010** Commercial Usage
    1111** Licensees holding valid Qt Commercial licenses may use this file in
    1212** accordance with the Qt Commercial License Agreement provided with the
    13 ** Software or, alternatively, in accordance with the terms contained in
    14 ** a written agreement between you and Nokia.
     13** Software or, alternatively, in accordance with the terms contained in a
     14** written agreement between you and Nokia.
    1515**
    16 ** GNU Lesser General Public License Usage
    17 ** Alternatively, this file may be used under the terms of the GNU Lesser
    18 ** General Public License version 2.1 as published by the Free Software
    19 ** Foundation and appearing in the file LICENSE.LGPL included in the
    20 ** packaging of this file.  Please review the following information to
    21 ** ensure the GNU Lesser General Public License version 2.1 requirements
    22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    23 **
    24 ** In addition, as a special exception, Nokia gives you certain additional
    25 ** rights.  These rights are described in the Nokia Qt LGPL Exception
    26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    27 **
    28 ** GNU General Public License Usage
    29 ** Alternatively, this file may be used under the terms of the GNU
    30 ** General Public License version 3.0 as published by the Free Software
    31 ** Foundation and appearing in the file LICENSE.GPL included in the
    32 ** packaging of this file.  Please review the following information to
    33 ** ensure the GNU General Public License version 3.0 requirements will be
    34 ** met: http://www.gnu.org/copyleft/gpl.html.
     16** GNU Free Documentation License
     17** Alternatively, this file may be used under the terms of the GNU Free
     18** Documentation License version 1.3 as published by the Free Software
     19** Foundation and appearing in the file included in the packaging of this
     20** file.
    3521**
    3622** If you have questions regarding the use of this file, please contact
    … …  
    4228/*!
    4329    \group modules
    44     \title All Qt Modules
     30    \title All Modules
    4531    \startpage index.html Qt Reference Documentation
    4632    \nextpage QtCore
    … …  
    5541    \row \o \l{QtCore} \o Core non-graphical classes used by other modules
    5642    \row \o \l{QtGui} \o Graphical user interface (GUI) components
    57     \row \o \l{QtMultimedia} \o Classes for low-level multimedia functionality
     43    \row \o \l{qtmultimedia-module.html}{QtMultimedia} \o Classes for low-level multimedia functionality
    5844    \row \o \l{QtNetwork} \o Classes for network programming
    5945    \row \o \l{QtOpenGL} \o OpenGL support classes
    … …  
    6652    \row \o \l{QtXml} \o Classes for handling XML
    6753    \row \o \l{QtXmlPatterns} \o An XQuery & XPath engine for XML and custom data models
     54    \row \o \l{QtDeclarative} \o An engine for declaratively building fluid user interfaces.
    6855    \row \o \l{Phonon Module}{Phonon} \o Multimedia framework classes
    6956    \row \o \l{Qt3Support} \o Qt 3 compatibility classes
    … …  
    9683    \module QtCore
    9784    \title QtCore Module
    98     \contentspage All Qt Modules
    99     \previouspage All Qt Modules
    100     \nextpage QtGui
    10185    \ingroup modules
    10286
    … …  
    10993
    11094    \snippet doc/src/snippets/code/doc_src_qtcore.qdoc 0
    111 
    112     The QtCore module is part of all \l{Qt editions}.
    11395*/
    11496
    … …  
    11799    \module QtGui
    118100    \title QtGui Module
    119     \contentspage All Qt Modules
    120     \previouspage QtCore
    121     \nextpage QtNetwork
    122101    \ingroup modules
    123102
    … …  
    128107
    129108    \snippet doc/src/snippets/code/doc_src_qtgui.qdoc 0
    130 
    131     The QtGui module is part of the \l{Qt GUI Framework Edition},
    132     the \l{Qt Full Framework Edition}, and the \l{Open Source Versions of Qt}.
    133109*/
    134110
    … …  
    136112    \module QtMultimedia
    137113    \title QtMultimedia Module
    138     \contentspage All Qt Modules
    139     \previouspage QtCore
    140     \nextpage QtNetwork
    141114    \ingroup modules
    142115
    … …  
    160133    \module QtNetwork
    161134    \title QtNetwork Module
    162     \contentspage All Qt Modules
    163     \previouspage QtMultimedia
    164     \nextpage QtOpenGL
    165135    \ingroup modules
    166136
    … …  
    177147
    178148    \snippet doc/src/snippets/code/doc_src_qtnetwork.qdoc 0
    179 
    180     The QtNetwork module is part of the \l{Qt Full Framework Edition} and the
    181     \l{Open Source Versions of Qt}.
    182149*/
    183150
    … …  
    185152    \module QtOpenGL
    186153    \title QtOpenGL Module
    187     \contentspage All Qt Modules
    188     \previouspage QtNetwork
    189     \nextpage QtOpenVG
    190     \ingroup modules
     154    \ingroup modules
     155        \ingroup technology-apis
    191156
    192157    \brief The QtOpenGL module offers classes that make it easy to
    … …  
    225190    non-OpenGL-specific GUI functionality.
    226191
    227     The QtOpenGL module is part of the \l{Qt Full Framework Edition} and the
    228     \l{Open Source Versions of Qt}. It is available on Windows, X11, and Mac OS X.
    229     \l{Qt for Embedded Linux and OpenGL} supports OpenGL ES (OpenGL for Embedded Systems).
     192    The QtOpenGL module is available on Windows, X11 and Mac OS X.
     193    \l{Qt for Embedded Linux and OpenGL} supports OpenGL ES (OpenGL for
     194    Embedded Systems).
    230195    \note To be able to use the OpenGL API in \l{Qt for Embedded Linux}, it must be
    231196    integrated with the Q Window System (QWS). See the
    … …  
    238203    \title QtOpenVG Module
    239204    \since 4.6
    240     \contentspage All Qt Modules
    241     \previouspage QtOpenGL
    242     \nextpage QtScript
    243     \ingroup modules
     205    \ingroup modules
     206        \ingroup technology-apis
    244207
    245208    \brief The QtOpenVG module is a plugin that provides support for
    … …  
    293256        \title QtScript Module
    294257        \since 4.3
    295         \contentspage All Qt Modules
    296         \previouspage QtOpenVG
    297         \nextpage QtScriptTools
    298258        \ingroup modules
    299259
    … …  
    304264        components that application developers may find useful.
    305265
    306         \tableofcontents
    307 
    308266        To include the definitions of the module's classes, use the
    309267        following directive:
    … …  
    318276        scriptable with QtScript, see \l{Making Applications
    319277        Scriptable}.
    320 
    321         The QtScript module is part of the \l{Qt Full Framework Edition} and the
    322         \l{Open Source Versions of Qt}.
    323278
    324279        \section1 License Information
    … …  
    358313  \title QtScriptTools Module
    359314  \since 4.5
    360   \contentspage All Qt Modules
    361   \previouspage QtScript
    362   \nextpage QtSql
    363315  \ingroup modules
    364316
    365317  \brief The QtScriptTools module provides additional components for applications that use Qt Script.
    366 
    367   \tableofcontents
    368318
    369319  \section1 Configuring the Build Process
    … …  
    379329
    380330  \snippet doc/src/snippets/code/doc.src.qtscripttools.qdoc 1
    381 
    382   The QtScriptTools module is part of the \l{Qt Full Framework Edition} and
    383   the \l{Open Source Versions of Qt}.
    384331*/
    385332
    … …  
    387334    \module QtSql
    388335    \title QtSql Module
    389     \contentspage All Qt Modules
    390     \previouspage QtScript
    391     \nextpage QtSvg
    392336    \ingroup modules
    393337
    … …  
    401345
    402346    \snippet doc/src/snippets/code/doc_src_qtsql.qdoc 1
    403 
    404     The QtSql module is part of the \l{Qt Full Framework Edition} and the
    405     \l{Open Source Versions of Qt}.
    406347
    407348    See the \l{SQL Programming} guide for information about using this
    … …  
    413354        \title QtSvg Module
    414355        \since 4.1
    415         \contentspage All Qt Modules
    416         \previouspage QtSql
    417         \nextpage QtWebKit
    418356        \ingroup modules
     357                \ingroup technology-apis
     358                \ingroup best-practices
    419359
    420360        \brief The QtSvg module provides classes for displaying and creating SVG files.
    … …  
    429369
    430370        \snippet doc/src/snippets/code/doc_src_qtsvg.qdoc 1
    431 
    432         The QtSvg module is part of the \l{Qt Full Framework Edition} and the
    433         \l{Open Source Versions of Qt}.
    434371
    435372        \section1 License Information
    … …  
    467404    \module QtXml
    468405    \title QtXml Module
    469     \contentspage All Qt Modules
    470     \previouspage QtSvg
    471     \nextpage QtXmlPatterns
    472     \ingroup modules
     406    \ingroup modules
     407        \ingroup technology-apis
    473408
    474409    \brief The QtXml module provides a stream reader and writer for
    … …  
    488423    provide, for example, classes that support SOAP and MML with the
    489424    Qt XML classes.
    490 
    491     This module is part of the \l{Qt Full Framework Edition} and the
    492     \l{Open Source Versions of Qt}.
    493425*/
    494426
    … …  
    497429    \title QtXmlPatterns Module
    498430    \since 4.4
    499     \contentspage All Qt Modules
    500     \previouspage QtXml
    501     \nextpage Phonon Module
    502     \ingroup modules
     431    \ingroup modules
     432        \ingroup technology-apis
    503433
    504434    \brief The QtXmlPatterns module provides support for XPath,
    … …  
    515445    \snippet doc/src/snippets/code/doc_src_qtxmlpatterns.qdoc 1
    516446
    517     This module is part of the \l{Qt Full Framework Edition} and the
    518     \l{Open Source Versions of Qt}.
    519 
    520     \section1 Further Links
     447    \section1 Further Reading
    521448
    522449    General overviews of XQuery and XSchema can be found in the
    523     \l{Using XML Technologies} document.
    524 
    525     An introduction to the XQuery language can be found in \l{A Short Path to XQuery}.
     450    \l{XQuery} document.
     451
     452    An introduction to the XQuery language can be found in
     453    \l{A Short Path to XQuery}.
    526454
    527455    \section1 License Information
    … …  
    579507    \module Phonon
    580508    \title Phonon Module
    581     \contentspage All Qt Modules
    582     \previouspage QtXmlPatterns
    583     \nextpage Qt3Support
    584509    \ingroup modules
    585510
    … …  
    601526    \snippet doc/src/snippets/code/doc_src_phonon.qdoc 1
    602527
    603     The Phonon module is part of the \l{Qt Full Framework Edition} and the
    604     \l{Open Source Versions of Qt}.
    605 
    606528    \section1 Qt Backends
    607529
    … …  
    630552    Copyright (C) 2008 Ian Monroe <ian@monroe.nu> \BR
    631553    Copyright (C) 2007-2008 Trolltech ASA \BR
    632     Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). \BR
     554    Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). \BR
    633555    Contact: Nokia Corporation (qt-info@nokia.com)
    634556
    … …  
    652574    \module Qt3Support
    653575    \title Qt3Support Module
    654     \contentspage All Qt Modules
    655     \previouspage Phonon Module
    656     \nextpage QtDesigner
    657576    \ingroup modules
    658577
    … …  
    679598    QtGui, QtNetwork, QtSql, and QtXml modules.
    680599
    681     This module is part of the \l{Qt Full Framework Edition} and the
    682     \l{Open Source Versions of Qt}. Most classes offered by this module are
    683     also part of the \l{Qt GUI Framework Edition}.
    684     Classes that are not available for \l{Qt GUI Framework Edition}
    685     users are marked as such in the class documentation.
    686 
    687600    \sa {Porting to Qt 4}
    688601*/
    … …  
    691604    \module QtDesigner
    692605    \title QtDesigner Module
    693     \contentspage All Qt Modules
    694     \previouspage Qt3Support
    695     \nextpage QtUiTools
    696606    \ingroup modules
    697607
    … …  
    712622
    713623    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 1
    714 
    715     \note These classes are part of the \l{Open Source Versions of Qt} and
    716     \l{Qt Commercial Editions}{Qt Full Framework Edition} for commercial
    717     users.
    718624*/
    719625
    … …  
    722628    \title QtUiTools Module
    723629    \since 4.1
    724     \contentspage All Qt Modules
    725     \previouspage QtDesigner
    726     \nextpage QtHelp
    727630    \ingroup modules
    728631
    … …  
    752655    \snippet doc/src/snippets/code/doc_src_qtuiloader.qdoc 1
    753656
    754     \note These classes are part of the \l{Open Source Versions of Qt} and
    755     \l{Qt Commercial Editions}{Qt Full Framework Edition} for commercial
    756     users.
    757 
    758657    \sa{Calculator Builder Example}, {World Time Clock Builder Example}
    759658*/
    … …  
    762661    \module QtHelp
    763662    \title QtHelp Module
    764     \contentspage All Qt Modules
    765     \previouspage QtUiTools
    766     \nextpage QtTest
    767663    \ingroup modules
    768664
    … …  
    770666    online documentation in applications.
    771667
     668    The classes and tools supplied with Qt to enable developers to include
     669    online help and documentation in their applications are described in
     670    more detail in \l{The Qt Help Framework} overview document.
     671
    772672    To include the definitions of the module's classes, use the
    773673    following directive:
    … …  
    779679
    780680    \snippet doc/src/snippets/code/doc_src_qthelp.qdoc 1
    781 
    782     These classes are part of the \l{Open Source Versions of Qt} and
    783     \l{Qt Commercial Editions}{Qt Full Framework Edition} for commercial
    784     users.
    785681
    786682    \section1 License Information
    … …  
    802698    \legalese
    803699    Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team \BR
    804     Changes are Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     700    Changes are Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    805701
    806702    This library is free software; you can redistribute it and/or
    … …  
    825721    \module QtTest
    826722    \title QtTest Module
    827     \contentspage All Qt Modules
    828     \previouspage QtHelp
    829     \nextpage QAxContainer
    830723    \ingroup modules
    831724
    … …  
    855748    \module QAxContainer
    856749    \title QAxContainer Module
    857     \contentspage All Qt Modules
    858     \previouspage QtTest
    859     \nextpage QAxServer
    860750    \ingroup modules
    861751
    … …  
    869759    The QAxContainer module is not covered by the \l{GNU General Public License (GPL)},
    870760    the \l{GNU Lesser General Public License (LGPL)}, or the
    871     \l{Qt Commercial Editions}{Qt Commercial License}. Instead, it is distributed under
     761    \l{Qt Commercial Edition}{Qt Commercial License}. Instead, it is distributed under
    872762    the following license.
    873763
    874764    \legalese
    875     Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).\br
     765    Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).\br
    876766    All rights reserved.
    877767
    … …  
    907797    \module QAxServer
    908798    \title QAxServer Module
    909     \contentspage All Qt Modules
    910     \previouspage QAxContainer
    911     \nextpage QtDBus module
    912799    \ingroup modules
    913800
    … …  
    921808    The QAxContainer module is not covered by the \l{GNU General Public License (GPL)},
    922809    the \l{GNU Lesser General Public License (LGPL)}, or the
    923     \l{Qt Commercial Editions}{Qt Commercial License}. Instead, it is distributed under
     810    \l{Qt Commercial Edition}{Qt Commercial License}. Instead, it is distributed under
    924811    the following license.
    925812
    926813    \legalese
    927     Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).\br
     814    Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).\br
    928815    All rights reserved.
    929816
    … …  
    959846    \module QtDBus
    960847    \title QtDBus module
    961     \contentspage All Qt Modules
    962     \previouspage QAxServer
    963848    \ingroup modules
    964849
    … …  
    967852
    968853    \brief The QtDBus module is a Unix-only library that you can use
    969     to perform Inter-Process Communication using the \l{Introduction to
    970     D-Bus}{D-Bus} protocol.
     854    to perform Inter-Process Communication using the \l{D-Bus} protocol.
    971855
    972856    Applications using the QtDBus module can provide services to
    … …  
    994878    tools are built.
    995879
    996     See the \l {Introduction to D-Bus} page for detailed information on
     880    See the \l {D-Bus} page for detailed information on
    997881    how to use this module.
    998882
    … …  
    1016900    The QAxContainer module is not covered by the \l{GNU General Public License (GPL)},
    1017901    the \l{GNU Lesser General Public License (LGPL)}, or the
    1018     \l{Qt Commercial Editions}{Qt Commercial License}. Instead, it is distributed under
     902    \l{Qt Commercial Edition}{Qt Commercial License}. Instead, it is distributed under
    1019903    the following license.
    1020904   
    1021905    \legalese
    1022     Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).\br
     906    Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).\br
    1023907    All rights reserved.
    1024908
    … …  
    1054938    \l{GNU General Public License (GPL)}, the
    1055939    \l{GNU Lesser General Public License (LGPL)}, or the
    1056     \l{Qt Commercial Editions}{Qt Commercial License}. Instead, they are
     940    \l{Qt Commercial Edition}{Qt Commercial License}. Instead, they are
    1057941    distributed under the following license.
    1058942   
    1059943    \legalese
    1060     Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).\br
     944    Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).\br
    1061945    All rights reserved.\br
    1062946    Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    1092976    \endlegalese
    1093977*/
    1094 
    1095 /*!
    1096     \page qtassistant.html
    1097     \title QtAssistant
    1098 
    1099     This module is no longer needed. Use the QtHelp module to integrate documentation
    1100     into your application.
    1101 
    1102     \sa {QtHelp}
    1103 */
Note: See TracChangeset for help on using the changeset viewer.