Changeset 769 for trunk/doc


Ignore:
Timestamp:
Aug 2, 2010, 9:27:30 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

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

Location:
trunk
Files:
41 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/doc/doc.pri

    r688 r769  
    4848htmldocs.files = $$QT_BUILD_TREE/doc/html
    4949htmldocs.path = $$[QT_INSTALL_DOCS]
    50 htmldocs.CONFIG += no_check_exist
     50htmldocs.CONFIG += no_check_exist
    5151
    5252qchdocs.files= $$QT_BUILD_TREE/doc/qch
    5353qchdocs.path = $$[QT_INSTALL_DOCS]
    54 qchdocs.CONFIG += no_check_exist
     54qchdocs.CONFIG += no_check_exist
    5555
    5656docimages.files = $$QT_BUILD_TREE/doc/src/images

  • trunk/doc/src/classes/phonon-api.qdoc

    r651 r769  
    16521652    different one. A user readable error message is given by
    16531653    errorString().
     1654
     1655
     1656
     1657
     1658
     1659
     1660
     1661
     1662
     1663
    16541664
    16551665    \sa Phonon::MediaSource, Phonon::AudioOutput, VideoWidget,

  • trunk/doc/src/deployment/deployment.qdoc

    r651 r769  
    933933
    934934    "C:/customPath/plugins "
    935     "C:/Qt/4.6.2/plugins"
     935    "C:/Qt/4.6./plugins"
    936936    "E:/myApplication/directory/"
    937937

  • trunk/doc/src/development/qmake-manual.qdoc

    r651 r769  
    859859    XCode build system.
    860860
    861     Furthermore, The selected "Active Build Configuration" is stored
     861    Furthermore, he selected "Active Build Configuration" is stored
    862862    in a .pbxuser file, which is generated by xcode on first load, not
    863863    created by qmake.
    … …  
    980980    If \c UID3 is not specified, qmake will automatically generate a \c UID3
    981981    suitable for development and debugging. This value should be manually
    982     specified for applications that are to be released. In order to optain
     982    specified for applications that are to be released. In order to otain
    983983    an official UID, please contact Nokia. Both \c SID and \c VID default to empty values.
    984984
    … …  
    14221422    override languages statement, you must override also package-header
    14231423    statement and all other statements which are language specific.
     1424
     1425
     1426
     1427
     1428
     1429
     1430
    14241431   
    1425     On the Symbian platform, the \c default_deployment item specifies
    1426     default platform dependencies. It can be overwritten if a more
    1427     restrictive set is needed - e.g. if a specific
    1428     device is required to run the application.
    1429    
     1432    \list
     1433    \o pkg_depends_qt
     1434    \o pkg_depends_webkit
     1435    \o pkg_platform_dependencies
     1436    \endlist
     1437
    14301438    For example:
    14311439   
    … …  
    17281736    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 139
    17291737
     1738
     1739
     1740
     1741
     1742
     1743
     1744
    17301745    \note You should not use this variable to add MMP statements that are
    1731     explicitly supported by their own variables, such as 
     1746    explicitly supported by their own variables, such as
    17321747    \c TARGET.EPOCSTACKSIZE.
    17331748    Doing so could result in duplicate statements in the MMP file.
    … …  
    28782893    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 144
    28792894   
    2880     This will add the specified statement to the end of the generated
    2881     registration resource file. As an impact of this statement, the application
    2882     will not be visible in application shell.
     2895    This will add the specified statement to the end of the
     2896    re
     2897    will not be visible in application shell.
    28832898   
    28842899    It is also possible to add multiple rows in a single block. Each double
    … …  
    28932908    be launched in background.
    28942909
    2895     For detailed list of possible RSS statements, please refer to the
    2896     Symbian platform help.   
     2910    For detailed list of possible statements, please refer to the
     2911    Symbian platform help.
    28972912
    28982913    \note You should not use \c RSS_RULES variable to set the following RSS statements:
    2899    
    2900     app_file
    2901     localisable_resource_file
    2902     localisable_resource_id
    2903 
    2904     These statements are internally handled by qmake.     
     2914    \c app_file, \c localisable_resource_file, and \c localisable_resource_id.
     2915
     2916    These statements are internally handled by qmake.
     2917
     2918    There is a number of special modifiers you can attach to \c RSS_RULES to specify where
     2919    in the application registration file the rule will be written:
     2920
     2921    \table
     2922    \header \o Modifier \o Location of the rule
     2923    \row \o <no modifier>        \o Inside \c APP_REGISTRATION_INFO resource struct.
     2924    \row \o .header              \o Before \c APP_REGISTRATION_INFO resource struct.
     2925    \row \o .footer              \o After \c APP_REGISTRATION_INFO resource struct.
     2926    \row \o .service_list        \o Inside a \c SERVICE_INFO item in the \c service_list
     2927                                 of \c APP_REGISTRATION_INFO
     2928    \row \o .file_ownership_list \o Inside a \c FILE_OWNERSHIP_INFO item in the
     2929                                 \c file_ownership_list of \c APP_REGISTRATION_INFO
     2930    \row \o .datatype_list       \o Inside a \c DATATYPE item in the \c datatype_list of
     2931                                 \c APP_REGISTRATION_INFO
     2932    \endtable
     2933
     2934    For example:
     2935
     2936    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 151
     2937
     2938    This example will define service information for a fictional service that requires
     2939    an icon to be supplied via the \c opaque_data of the service information.
    29052940
    29062941    \target S60_VERSION
    … …  
    29612996
    29622997    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 51
     2998
     2999
     3000
     3001
     3002
     3003
     3004
     3005
     3006
     3007
     3008
     3009
     3010
     3011
     3012
     3013
     3014
     3015
     3016
     3017
     3018
     3019
     3020
     3021
     3022
     3023
     3024
     3025
    29633026
    29643027    \target TARGET
    … …  
    35053568    \section1 Properties
    35063569
    3507     \c qmake has a system of persistant information, this allows you to
     3570    \c qmake has a system of persistnt information, this allows you to
    35083571    \c set a variable in qmake once, and each time qmake is invoked this
    35093572    value can be queried. Use the following to set a property in qmake:
    … …  
    36833746    dependent .prl files, continuing until all libraries have been resolved.
    36843747    At this point, the Makefile is created as usual, and the libraries are
    3685     linked explicitlyy against the application.
     3748    linked explicitly against the application.
    36863749
    36873750    The internals of the .prl file are left closed so they can easily

  • trunk/doc/src/development/qtestlib.qdoc

    r651 r769  
    238238    The code insde the QBENCHMARK macro will be measured, and possibly also repeated
    239239    several times in order to get an accurate measurement. This depends on the selected
    240     measurement back-end. Several back-ends are available an can be selected on the
     240    measurement back-end. Several back-ends are available can be selected on the
    241241    command line:
    242242   
    … …  
    245245    \table
    246246    \header \o Name
    247          \o Commmand-line Arguemnt
     247         \o Commmand-line Argunt
    248248         \o Availability
    249249    \row \o Walltime

  • trunk/doc/src/examples/googlesuggest.qdoc

    r651 r769  
    112112
    113113    Key event handling is implemented so that Enter and Return execute the
    114     selected link, while the Escape key hides the popup. Sine we want to be
     114    selected link, while the Escape key hides the popup. Sine we want to be
    115115    able to navigate the list of suggestions using the different navigation
    116116    keys on the keyboard we let Qt continue regular event processing for those

  • trunk/doc/src/examples/scribble.qdoc

    r651 r769  
    7575    \endlist
    7676
    77     We will start by reviewing the \c ScribbleArea class, which
    78     contains the interesting, then we will take a look at the \c
    79     MainWindow class that uses it.
     77    We will start by reviewing the \c ScribbleArea class. Then we will
     78    review the \c MainWindow class, which uses \c ScribbleArea.
    8079
    8180    \section1 ScribbleArea Class Definition

  • trunk/doc/src/examples/svgalib.qdoc

    r651 r769  
    4343    \example qws/svgalib
    4444    \title Accelerated Graphics Driver Example
     45
     46
     47
    4548
    4649    The Accelerated Graphics Driver example shows how you can write

  • trunk/doc/src/frameworks-technologies/activeqt.qdoc

    r651 r769  
    5858
    5959    \ingroup platform-specific
     60
    6061    \keyword ActiveQt
    6162
    … …  
    7071    \endlist
    7172
     73
     74
     75
    7276    The ActiveQt framework consists of two modules:
    7377
    7478    \list
    75     \o The \l QAxContainer module is a static
    76        library implementing QObject and QWidget subclasses, QAxObject and
    77        QAxWidget, that act as containers for COM objects and ActiveX
    78        controls.
    79     \o The \l QAxServer module is a static library that implements
     79    \o The \l{Using ActiveX controls and COM objects in Qt}{QAxContainer}
     80       module is a static library implementing QObject and QWidget subclasses,
     81       QAxObject and QAxWidget, that act as containers for COM objects and
     82       ActiveX controls.
     83    \o The \l{Building ActiveX servers and controls with Qt}{QAxServer}
     84       module is a static library that implements
    8085       functionality for in-process and executable COM servers. This
    8186       module provides the QAxAggregated, QAxBindable and QAxFactory
    8287       classes.
    8388    \endlist
     89
     90
     91
    8492
    8593    To build the static libraries, change into the \c activeqt directory

  • trunk/doc/src/getting-started/examples.qdoc

    r651 r769  
    407407    \section1 \l{D-Bus Examples}{D-Bus}
    408408    \beginfloatleft
    409     \l{D-Bus Examples}{\inlineimage qt-embedded-examples.png
     409    \l{D-Bus Examples}{\inlineimage -examples.png
    410410    }
    411411
    … …  
    417417    \section1 \l{Qt for Embedded Linux Examples}{Qt for Embedded Linux}
    418418    \beginfloatleft
    419     \l{Qt for Embedded Linux Examples}{\inlineimage dbus-examples.png
     419    \l{Qt for Embedded Linux Examples}{\inlineimage -examples.png
    420420    }
    421421

  • trunk/doc/src/getting-started/installation.qdoc

    r651 r769  
    6767
    6868\o  Unpack the archive if you have not done so already. For example,
    69     if you have the \c{qt-everywhere-opensource-src-4.6.2.tar.gz}
     69    if you have the \c{qt-everywhere-opensource-src-4.6..tar.gz}
    7070    package, type the following commands at a command line prompt:
    7171
    7272\snippet doc/src/snippets/code/doc_src_installation.qdoc 0
    7373
    74     This creates the directory \c{/tmp/qt-everywhere-opensource-src-4.6.2}
     74    This creates the directory \c{/tmp/qt-everywhere-opensource-src-4.6.}
    7575    containing the files from the archive. We only support the GNU version of
    7676    the tar archiving utility. Note that on some systems it is called gtar.
    … …  
    8282
    8383    By default, Qt is configured for installation in the
    84     \c{/usr/local/Trolltech/Qt-4.6.2} directory, but this can be
     84    \c{/usr/local/Trolltech/Qt-4.6.} directory, but this can be
    8585    changed by using the \c{-prefix} option.
    8686
    … …  
    134134    For compilers that do not support rpath you must also extended the
    135135    \c LD_LIBRARY_PATH environment variable to include
    136     \c{/usr/local/Trolltech/Qt-4.6.2/lib}. On Linux with GCC this step
     136    \c{/usr/local/Trolltech/Qt-4.6./lib}. On Linux with GCC this step
    137137    is not needed.
    138138
    … …  
    194194
    195195\o  Uncompress the files into the directory you want Qt installed;
    196     e.g. \c{C:\Qt\4.6.2}.
     196    e.g. \c{C:\Qt\4.6.}.
    197197
    198198    \note The install path must not contain any spaces or Windows specific
    … …  
    206206\snippet doc/src/snippets/code/doc_src_installation.qdoc 7
    207207
    208     This is done by adding \c{c:\Qt\4.6.2\bin} to the \c PATH variable.
     208    This is done by adding \c{c:\Qt\4.6.\bin} to the \c PATH variable.
    209209
    210210    For newer versions of Windows, \c PATH can be extended through
    … …  
    300300
    301301\o  Unpack the archive if you have not done so already. For example,
    302     if you have the \c{qt-everywhere-opensource-src-4.6.2.tar.gz}
     302    if you have the \c{qt-everywhere-opensource-src-4.6..tar.gz}
    303303    package, type the following commands at a command line prompt:
    304304
    305305\snippet doc/src/snippets/code/doc_src_installation.qdoc 11
    306306
    307     This creates the directory \c{/tmp/qt-everywhere-opensource-src-4.6.2}
     307    This creates the directory \c{/tmp/qt-everywhere-opensource-src-4.6.}
    308308    containing the files from the archive.
    309309
    … …  
    314314
    315315    By default, Qt is configured for installation in the
    316     \c{/usr/local/Trolltech/Qt-4.6.2} directory, but this can be
     316    \c{/usr/local/Trolltech/Qt-4.6.} directory, but this can be
    317317    changed by using the \c{-prefix} option.
    318318
    … …  
    407407\list 1
    408408    \o  Uncompress the files into the directory you want to install Qt into;
    409         e.g., \c{C:\Qt\4.6.2}.
     409        e.g., \c{C:\Qt\4.6.}.
    410410
    411411        \note The install path must not contain any spaces.
    … …  
    418418        \snippet doc/src/snippets/code/doc_src_installation.qdoc 18
    419419
    420         This is done by adding \c{c:\Qt\4.6.2\bin} to the \c PATH variable.
     420        This is done by adding \c{c:\Qt\4.6.\bin} to the \c PATH variable.
    421421
    422422        For newer versions of Windows, \c PATH can be extended through
    … …  
    507507    \o  Install Qt
    508508
    509         Run \c{qt-symbian-opensource-4.6.2.exe} and follow the instructions.
     509        Run \c{qt-symbian-opensource-4.6..exe} and follow the instructions.
    510510
    511511        \note Qt must be installed on the same drive as the Symbian SDK you are
    … …  
    587587
    588588        Uncompress the \l{http://qt.nokia.com/downloads}{downloaded} source package into the
    589         directory you want Qt installed, e.g. \c{C:\Qt\4.6.2}.
     589        directory you want Qt installed, e.g. \c{C:\Qt\4.6.}.
    590590
    591591        \note Qt must be installed on the same drive as the Symbian SDK you are
    … …  
    599599        \snippet doc/src/snippets/code/doc_src_installation.qdoc 18
    600600
    601         This is done by adding \c{c:\Qt\4.6.2\bin} to the \c PATH variable.
     601        This is done by adding \c{c:\Qt\4.6.\bin} to the \c PATH variable.
    602602
    603603        On Windows the PATH can be extended by navigating to
    … …  
    755755    \endlist
    756756
    757     \sa {Known Issues in 4.6.2}
     757    \sa {Known Issues in 4.6.}
    758758*/
    759759
    … …  
    765765    \previouspage General Qt Requirements
    766766
    767     \sa {Known Issues in 4.6.2}
     767    \sa {Known Issues in 4.6.}
    768768*/
    769769
    … …  
    904904    distribution's package repository to find suitable packages.
    905905
    906     \sa {Known Issues in 4.6.2}
     906    \sa {Known Issues in 4.6.}
    907907*/
    908908
    … …  
    958958    \l{Windows CE - Working with Custom SDKs}{here}.
    959959
    960     \sa {Known Issues in 4.6.2}
     960    \sa {Known Issues in 4.6.}
    961961*/
    962962
    … …  
    968968    \previouspage General Qt Requirements
    969969
    970     \sa {Known Issues in 4.6.2}
     970    \sa {Known Issues in 4.6.}
    971971
    972972    \section1 Building Qt for Embedded Linux with uclibc
    … …  
    10681068    to get more information about how to setup the development environment.
    10691069
    1070     \sa {Known Issues in 4.6.2}
    1071 */
     1070    \sa {Known Issues in 4.6.}
     1071*/

  • trunk/doc/src/getting-started/known-issues.qdoc

    r651 r769  
    4242/*!
    4343    \page known-issues.html
    44     \title Known Issues in 4.6.2
     44    \title Known Issues in 4.6.
    4545    \ingroup platform-specific
    46     \brief A summary of known issues in Qt 4.6.2 at the time of release.
     46    \brief A summary of known issues in Qt 4.6. at the time of release.
    4747
    48     An up-to-date list of known issues with Qt 4.6.2 can be found via the
     48    An up-to-date list of known issues with Qt 4.6. can be found via the
    4949    \l{http://bugreports.qt.nokia.com/}{Qt Bug Tracker}.
    5050
    51     For a list list of known bugs in Qt 4.6.2, see the \l{Task Tracker}
     51    For a list list of known bugs in Qt 4.6., see the \l{Task Tracker}
    5252    on the Qt website.
    5353

  • trunk/doc/src/howtos/openvg.qdoc

    r651 r769  
    173173
    174174    The other members of QPainter::CompositionMode are not supported
    175     because OpenVG 1.1 does not have an equivalent in its \c VGBlendMode
    176     enumeration.  Any attempt to set an unsupported mode will result in
     175    unless the \c{VG_KHR_advanced_blending} extension is present,
     176    in which case the following additional modes are supported:
     177
     178    \list
     179    \o QPainter::CompositionMode_Overlay
     180    \o QPainter::CompositionMode_ColorDodge
     181    \o QPainter::CompositionMode_ColorBurn
     182    \o QPainter::CompositionMode_HardLight
     183    \o QPainter::CompositionMode_SoftLight
     184    \o QPainter::CompositionMode_Difference
     185    \o QPainter::CompositionMode_Exclusion
     186    \o QPainter::CompositionMode_SourceOut
     187    \o QPainter::CompositionMode_DestinationOut
     188    \o QPainter::CompositionMode_SourceAtop
     189    \o QPainter::CompositionMode_DestinationAtop
     190    \o QPainter::CompositionMode_Xor
     191    \endlist
     192
     193    Any attempt to set an unsupported mode will result in
    177194    the actual mode being set to QPainter::CompositionMode_SourceOver.
    178195    Client applications should avoid using unsupported modes.
    … …  
    296313    using OpenVG operations.
    297314
     315
     316
     317
     318
     319
     320
     321
     322
     323
     324
    298325    \section1 Known issues
    299326

  • trunk/doc/src/internationalization/linguist-manual.qdoc

    r651 r769  
    725725    keyboard accelerators: Alt key and Ctrl key accelerators.
    726726
    727     \section3 Alt Key Accellerators
     727    \section3 Alt Key Accelerators
    728728
    729729    Alt key accelerators are used in menu selection and on buttons.

  • trunk/doc/src/modules.qdoc

    r651 r769  
    518518    \l{Open Source Versions of Qt}.
    519519
     520
     521
     522
     523
     524
     525
     526
    520527    \section1 License Information
    521528
    … …  
    855862    \brief The QAxContainer module is a Windows-only extension for
    856863    accessing ActiveX controls and COM objects.
     864
     865
    857866
    858867    \section1 License Information
    … …  
    905914    \brief The QAxServer module is a Windows-only static library that
    906915    you can use to turn a standard Qt binary into a COM server.
     916
     917
    907918
    908919    \section1 License Information

  • trunk/doc/src/objectmodel/signalsandslots.qdoc

    r651 r769  
    380380
    381381    The signatures of signals and slots may contain arguments, and the
    382     arguments can have defualt values. Consider QObject::destroyed():
     382    arguments can have deflt values. Consider QObject::destroyed():
    383383
    384384    \code

  • trunk/doc/src/platforms/emb-directfb-EmbLinux.qdoc

    r651 r769  
    268268    \o By default Qt will use DirectFB to load QPixmaps from disk/memory. If
    269269your DirectFB implementation does not support this it might make sense to
    270 define this.
     270define this. If you see strange rendering issues with pixmaps that have an
     271alpha channel defining this could solve the problem.
    271272
    272273 \row
    … …  
    328329defines should only be used when optimizing the application.
    329330
     331
     332
     333
     334
     335
    330336*/

  • trunk/doc/src/platforms/emb-features.qdoc

    r651 r769  
    106106    desktop platforms.
    107107
    108     \bold{Windows CE:} The Qt for Windows CE package contains a \c qconfig
    109     executable that you can run on a Windows desktop to configure the build.
    110 
    111108    \image qt-embedded-qconfigtool.png
    112109

  • trunk/doc/src/platforms/emb-install.qdoc

    r651 r769  
    8585    ./configure script to configure the library for your development
    8686    architecture. You can list all of the configuration system's
    87     options by typing \c {./configure -help}.
     87    options by typing
     88
     89    \snippet doc/src/snippets/code/doc_src_emb-install.qdoc embedded help
    8890
    8991    Note that by default, \l{Qt for Embedded Linux} is configured for
    90     installation in the \c{/usr/local/Trolltech/QtEmbedded-4.6.2}
     92    installation in the \c{/usr/local/Trolltech/QtEmbedded-4.6.}
    9193    directory, but this can be changed by using the \c{-prefix}
    9294    option. Alternatively, the \c{-prefix-install} option can be used
    … …  
    148150    For compilers that do not support \c rpath you must also extend
    149151    the \c LD_LIBRARY_PATH environment variable to include
    150     \c /usr/local/Trolltech/QtEmbedded-4.6.2/lib. Note that on Linux
     152    \c /usr/local/Trolltech/QtEmbedded-4.6./lib. Note that on Linux
    151153    with GCC, this step is not needed.
    152154

  • trunk/doc/src/platforms/emb-openvg.qdocinc

    r561 r769  
    136136
    137137The other members of QPainter::CompositionMode are not supported
    138 because OpenVG 1.1 does not have an equivalent in its \c VGBlendMode
    139 enumeration.  Any attempt to set an unsupported mode will result in
     138unless the \c{VG_KHR_advanced_blending} extension is present,
     139in which case the following additional modes are supported:
     140
     141\list
     142\o QPainter::CompositionMode_Overlay
     143\o QPainter::CompositionMode_ColorDodge
     144\o QPainter::CompositionMode_ColorBurn
     145\o QPainter::CompositionMode_HardLight
     146\o QPainter::CompositionMode_SoftLight
     147\o QPainter::CompositionMode_Difference
     148\o QPainter::CompositionMode_Exclusion
     149\o QPainter::CompositionMode_SourceOut
     150\o QPainter::CompositionMode_DestinationOut
     151\o QPainter::CompositionMode_SourceAtop
     152\o QPainter::CompositionMode_DestinationAtop
     153\o QPainter::CompositionMode_Xor
     154\endlist
     155
     156Any attempt to set an unsupported mode will result in
    140157the actual mode being set to QPainter::CompositionMode_SourceOver.
    141158Client applications should avoid using unsupported modes.
    … …  
    260277accelerated using OpenVG operations.
    261278
     279
     280
     281
     282
     283
     284
    262285\endtable
    263286

  • trunk/doc/src/platforms/platform-notes.qdoc

    r651 r769  
    251251    \section1 Windows Vista
    252252
    253     At the time Qt 4.6.2 was released, there were no known Vista-specific issues.
     253    At the time Qt 4.6. was released, there were no known Vista-specific issues.
    254254
    255255    \target Windows NT
    … …  
    420420
    421421    Qt for Symbian provides the same level of source compatibility guarantee as
    422     given for other platforms.  That is, a program which compiles against a given
     422    given for other platforms. That is, a program which compiles against a given
    423423    version of Qt for Symbian will also compile against all future versions of the
    424424    same major release.
    … …  
    503503    \l{Exception Safety with Symbian}.
    504504
     505
     506
     507
     508
     509
     510
     511
     512
     513
     514
     515
     516
     517
     518
     519
     520
     521
     522
     523
     524
     525
     526
     527
     528
     529
     530
     531
     532
    505533    \section1 Multimedia and Phonon Support
    506534

  • trunk/doc/src/platforms/supported-platforms.qdoc

    r651 r769  
    117117    \row    \o HPUXi 11.23
    118118                                     \o aCC 6.10
    119     \row    \o Solaris 10 UltraSparc
     119    \row    \o Solaris 10
    120120                                     \o Sun Studio 12
    121121    \row    \o AIX 6

  • trunk/doc/src/platforms/symbian-introduction.qdoc

    r651 r769  
    133133                                missing dependencies in addition to
    134134                                just installing the application.
     135
     136
    135137    \endtable
    136138

  • trunk/doc/src/platforms/wince-customization.qdoc

    r651 r769  
    214214    \o The shadow build directory must be on the same level as the Qt source
    215215        package.\br
    216     If the Qt package is in \c{C:\Qt\4.6.2} the shadow build directory
     216    If the Qt package is in \c{C:\Qt\4.6.} the shadow build directory
    217217    could be \c{C:\Qt\shadowbuild}. A shadow build from a directory like
    218218    \c{C:\shadowbuild} will not compile.
    … …  
    225225    \endlist
    226226
    227     So lets assume you have installed Qt in \c{C:\Qt\4.6.2} and you want
     227    So lets assume you have installed Qt in \c{C:\Qt\4.6.} and you want
    228228    to create a shadow build in \c{C:\Qt\mobile5-shadow}:
    229229

  • trunk/doc/src/porting/porting4.qdoc

    r651 r769  
    32023202    The \c QShared class has been obsoleted by the more powerful
    32033203    QSharedData and QSharedDataPointer as a means of creating custom
    3204     implicitly shared classes. It has been renamed Q3Shared moved to
    3205     the Qt3Support library.
     3204    implicitly shared classes. It has been renamed Q3Shared
     3205    the Qt3Support library.
    32063206
    32073207    An easy way of porting to Qt 4 is to include this class into your
    … …  
    32273227
    32283228    QSimpleRichText has been obsoleted by QTextDocument. It has
    3229     bene renamed Q3SimpleRichText and moved to the Qt3Support
     3229    be renamed Q3SimpleRichText and moved to the Qt3Support
    32303230    library.
    32313231

  • trunk/doc/src/porting/qt4-network.qdoc

    r651 r769  
    200200    eliminated. These classes attempted the impossible (unify FTP and
    201201    HTTP under one roof), and unsurprisingly failed at that. Qt 4
    202     still provides QFtp, and it also proveds the QNetworkAccessManager.
     202    still provides QFtp, and it also provs the QNetworkAccessManager.
    203203
    204204    The QSocket class in Qt 3 has been renamed QTcpSocket. The new

  • trunk/doc/src/qt4-intro.qdoc

    r651 r769  
    469469    included in the \c changes-4.6.0 file
    470470    \l{http://qt.nokia.com/developer/changes/changes-4.6.0}{available
    471     online}. A \l{Known Issues in 4.6.2}{list of known issues}
     471    online}. A \l{Known Issues in 4.6.}{list of known issues}
    472472    for this release is also available.
    473473
    474474    Changes between this release and the previous release are provided
    475     in the \c{changes-4.6.2} file (also
    476     \l{http://qt.nokia.com/developer/changes/changes-4.6.2}{available online}).
     475    in the \c{changes-4.6.} file (also
     476    \l{http://qt.nokia.com/developer/changes/changes-4.6.}{available online}).
    477477\endomit
    478478
    … …  
    683683    in the \c changes-4.5.0 file
    684684    \l{http://qt.nokia.com/developer/changes/changes-4.5.0}{available online}.
    685     A \l{Known Issues in 4.6.2}{list of known issues} for this release is also
     685    A \l{Known Issues in 4.6.}{list of known issues} for this release is also
    686686    available.
    687687
    688688    Changes between this release and the previous release are provided
    689     in the \c{changes-4.6.2} file (also
    690     \l{http://qt.nokia.com/developer/changes/changes-4.6.2}{available online}).
     689    in the \c{changes-4.6.} file (also
     690    \l{http://qt.nokia.com/developer/changes/changes-4.6.}{available online}).
    691691
    692692    A list of other Qt 4 features can be found on the

  • trunk/doc/src/scripting/scripting.qdoc

    r651 r769  
    10081008  implementing functions that take a variable number of arguments
    10091009  is simple. In fact, as we have seen, in the technical sense \e{all}
    1010   Qt Script functions can be seen as variable-argument functions).
     1010  Qt Script functions can be seen as variable-argument functions.
    10111011  As an example, consider a concat() function that takes an arbitrary
    10121012  number of arguments, converts the arguments to their string

  • trunk/doc/src/snippets/code/doc_src_deployment.qdoc

    r651 r769  
    464464    ":\"Example Vendor\""
    465465
    466 default_deployment.pkg_prerules = vendorinfo
     466my_deployment.pkg_prerules = vendorinfo
     467DEPLOYMENT += my_deployment
    467468//! [56]
    468469
    … …  
    472473    "[0x1028315F],0,0,0,{\"S60ProductID\"}"
    473474
    474 default_deployment.pkg_prerules += supported_platforms
     475default_deployment.pkg_prerules -= pkg_platform_dependencies
     476my_deployment.pkg_prerules += supported_platforms
     477DEPLOYMENT += my_deployment
    475478//! [57]
    476479

  • trunk/doc/src/snippets/code/doc_src_emb-install.qdoc

    r651 r769  
    4242//! [0]
    4343cd <anywhere>
    44 gunzip qt-embedded-linux-commercial-src-4.6.2.tar.gz
    45 tar xf qt-embedded-linux-commercial-src-4.6.2.tar
     44gunzip qt-e.tar.gz
     45tar xf qt-e.tar
    4646//! [0]
    4747
    4848
    4949//! [1]
    50 ~/qt-embedded-linux-commercial-src-4.6.2
     50~/qt-e
    5151//! [1]
    5252
    5353
     54
     55
     56
     57
    5458//! [2]
    55 cd  ~/qt-embedded-linux-commercial-src-4.6.2
     59cd  ~/qt-e
    5660./configure -embedded [architecture]
    5761//! [2]
    … …  
    6973
    7074//! [5]
    71 PATH=/usr/local/Trolltech/QtEmbedded-4.6.2/bin:$PATH
     75PATH=/usr/local/Trolltech/QtEmbedded-4.6./bin:$PATH
    7276export PATH
    7377//! [5]
    … …  
    7579
    7680//! [6]
    77 setenv PATH /usr/local/Trolltech/QtEmbedded-4.6.2/bin:$PATH
     81setenv PATH /usr/local/Trolltech/QtEmbedded-4.6./bin:$PATH
    7882//! [6]

  • trunk/doc/src/snippets/code/doc_src_installation.qdoc

    r651 r769  
    4242//! [0]
    4343cd /tmp
    44 gunzip qt-everywhere-opensource-src-4.6.2.tar.gz        # uncompress the archive
    45 tar xvf qt-everywhere-opensource-src-4.6.2.tar          # unpack it
     44gunzip qt-everywhere-opensource-src-4.6..tar.gz        # uncompress the archive
     45tar xvf qt-everywhere-opensource-src-4.6..tar          # unpack it
    4646//! [0]
    4747
    4848
    4949//! [1]
    50 cd /tmp/qt-everywhere-opensource-src-4.6.2
     50cd /tmp/qt-everywhere-opensource-src-4.6.
    5151./configure
    5252//! [1]
    … …  
    6969
    7070//! [5]
    71 PATH=/usr/local/Trolltech/Qt-4.6.2/bin:$PATH
     71PATH=/usr/local/Trolltech/Qt-4.6./bin:$PATH
    7272export PATH
    7373//! [5]
    … …  
    7575
    7676//! [6]
    77 setenv PATH /usr/local/Trolltech/Qt-4.6.2/bin:$PATH
     77setenv PATH /usr/local/Trolltech/Qt-4.6./bin:$PATH
    7878//! [6]
    7979
    … …  
    8686//! [8]
    8787C:
    88 cd /D C:\Qt\4.6.2
     88cd /D C:\Qt\4.6.
    8989configure
    9090//! [8]
    … …  
    103103//! [11]
    104104cd /tmp
    105 gunzip qt-everywhere-opensource-src-4.6.2.tar.gz        # uncompress the archive
    106 tar xvf qt-everywhere-opensource-src-4.6.2.tar          # unpack it
     105gunzip qt-everywhere-opensource-src-4.6..tar.gz        # uncompress the archive
     106tar xvf qt-everywhere-opensource-src-4.6..tar          # unpack it
    107107//! [11]
    108108
    109109
    110110//! [12]
    111 cd /tmp/qt-everywhere-opensource-src-4.6.2
     111cd /tmp/qt-everywhere-opensource-src-4.6.
    112112./configure
    113113//! [12]
    … …  
    130130
    131131//! [16]
    132 PATH=/usr/local/Trolltech/Qt-4.6.2/bin:$PATH
     132PATH=/usr/local/Trolltech/Qt-4.6./bin:$PATH
    133133export PATH
    134134//! [16]
    … …  
    136136
    137137//! [17]
    138 setenv PATH /usr/local/Trolltech/Qt-4.6.2/bin:$PATH
     138setenv PATH /usr/local/Trolltech/Qt-4.6./bin:$PATH
    139139//! [17]
    140140
    … …  
    147147//! [19]
    148148C:
    149 cd \Qt\4.6.2
     149cd \Qt\4.6.
    150150configure -platform win32-msvc2005 -xplatform wincewm50pocket-msvc2005
    151151//! [19]
    … …  
    170170
    171171//! [23]
    172 cd \Qt\4.6.2
     172cd \Qt\4.6.
    173173configure -platform win32-g++ -xplatform symbian-abld
    174174//! [23]
    … …  
    209209
    210210//! [31]
    211 cd \Qt\4.6.2
     211cd \Qt\4.6.
    212212configure -platform win32-g++ -xplatform symbian-sbsv2
    213213//! [31]

  • trunk/doc/src/snippets/code/doc_src_porting4.qdoc

    r651 r769  
    453453richText.setWidth(w);
    454454
    455 // Or set a resonable default size
     455// Or set a resonable default size
    456456richText.adjustSize();
    457457

  • trunk/doc/src/snippets/code/doc_src_qmake-manual.qdoc

    r651 r769  
    934934
    935935//! [141]
    936 default_deployment.pkg_prerules = "[0x11223344],0,0,0,{\"SomeSpecificDeviceID\"}"
     936default_deployment.pkg_prerules -= pkg_platform_dependencies
     937my_deployment.pkg_prerules = "[0x11223344],0,0,0,{\"SomeSpecificDeviceID\"}"
     938DEPLOYMENT += my_deployment
    937939//! [141]
    938940
    … …  
    970972DEPLOYMENT.installer_header = "$${LITERAL_HASH}{\"My Application Installer\"},(0x12345678),1,0,0"
    971973//! [147]
     974
     975
     976
     977
     978
     979
     980
     981
     982
     983
     984
     985
     986
     987
     988
     989
     990
     991
     992
     993
     994
     995
     996
     997
     998
     999
     1000
     1001
     1002
     1003
     1004
     1005

  • trunk/doc/src/snippets/code/doc_src_qtestlib.qdoc

    r651 r769  
    111111//! [10]
    112112********* Start testing of TestQString *********
    113 Config: Using QTest library 4.6.2, Qt 4.6.2
     113Config: Using QTest library 4.6.
    114114PASS   : TestQString::initTestCase()
    115115PASS   : TestQString::toUpper()

  • trunk/doc/src/snippets/code/doc_src_wince-customization.qdoc

    r651 r769  
    6363//! [4]
    6464cd c:\Qt\mobile5-shadow
    65 C:\Qt\4.6.2\configure.exe -platform win32-msvc2005 -xplatform wincewm50pocket-msvc2005 -release
     65C:\Qt\4.6.\configure.exe -platform win32-msvc2005 -xplatform wincewm50pocket-msvc2005 -release
    6666//! [4]
    6767

  • trunk/doc/src/snippets/code/src_corelib_kernel_qobject.cpp

    r651 r769  
    375375           [WRITE setFunction]
    376376           [RESET resetFunction]
     377
    377378           [DESIGNABLE bool]
    378379           [SCRIPTABLE bool]
    379380           [STORED bool]
    380            [USER bool])
     381           [USER bool]
     382           [CONSTANT]
     383           [FINAL])
    381384//! [36]
    382385

  • trunk/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp

    r651 r769  
    129129
    130130// this QScopedPointer frees its data using free():
    131 QScopedPointer<int, QScopedPointerPodDeleter<int> > podPointer(reinterpret_cast<int *>(malloc(42)));
     131QScopedPointer<int, QScopedPointerPodDeleter> podPointer(reinterpret_cast<int *>(malloc(42)));
    132132
    133133// this struct calls "myCustomDeallocator" to delete the pointer

  • trunk/doc/src/widgets-and-layouts/styles.qdoc

    r651 r769  
    126126    QStyle draw widgets without linking in any code for the widget. This
    127127    makes it possible to use \l{QStyle}'s draw functions on any paint
    128     device. Ie you can draw a combobox on any widget, not just on a
     128    device you can draw a combobox on any widget, not just on a
    129129    QComboBox.
    130130

  • trunk/doc/src/widgets-and-layouts/stylesheet.qdoc

    r651 r769  
    38233823    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 148
    38243824
    3825     Sine Qt 4.6 the close button can be customized as follow:
     3825    Sine Qt 4.6 the close button can be customized as follow:
    38263826    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 159
    38273827

  • trunk/doc/src/windows-and-dialogs/mainwindow.qdoc

    r651 r769  
    5252    \nextpage The Application Main Window
    5353
    54     A \l{Widgets}{widget} that is not embedded in a parent widget is called a window.
     54    A \l{Widgets}{widget} that is not embedded in a parent widget is called a window.
    5555    Usually, windows have a frame and a title bar, although it is also possible to create
    5656    windows without such decoration using suitable window flags). In Qt, QMainWindow
Note: See TracChangeset for help on using the changeset viewer.