Changeset 865 for trunk/doc


Ignore:
Timestamp:
May 16, 2011, 4:09:34 PM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

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

Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk

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

    r846 r865  
    902902
    903903    "C:/customPath/plugins "
    904     "C:/Qt/4.7.2/plugins"
     904    "C:/Qt/4.7.3/plugins"
    905905    "E:/myApplication/directory/"
    906906

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

    r846 r865  
    5959\section1 Step 2: Unpacking the Archive
    6060    Unpack the archive if you have not done so already. For example,
    61     if you have the \c{qt-everywhere-opensource-src-4.7.2.tar.gz}
     61    if you have the \c{qt-everywhere-opensource-src-4.7.3.tar.gz}
    6262    package, type the following commands at a command line prompt:
    6363
    6464\snippet doc/src/snippets/code/doc_src_installation.qdoc 0
    6565
    66     This creates the directory \c{/tmp/qt-everywhere-opensource-src-4.7.2}
     66    This creates the directory \c{/tmp/qt-everywhere-opensource-src-4.7.3}
    6767    containing the files from the archive. We only support the GNU version of
    6868    the tar archiving utility. Note that on some systems it is called gtar.
    … …  
    7474
    7575    By default, Qt is configured for installation in the
    76     \c{/usr/local/Trolltech/Qt-4.7.2} directory, but this can be
     76    \c{/usr/local/Trolltech/Qt-4.7.3} directory, but this can be
    7777    changed by using the \c{-prefix} option.
    7878
    … …  
    124124    For compilers that do not support rpath you must also extended the
    125125    \c LD_LIBRARY_PATH environment variable to include
    126     \c{/usr/local/Trolltech/Qt-4.7.2/lib}. On Linux with GCC this step
     126    \c{/usr/local/Trolltech/Qt-4.7.3/lib}. On Linux with GCC this step
    127127    is not needed.
    128128
    … …  
    185185
    186186    Uncompress the files into the directory you want Qt installed;
    187     e.g. \c{C:\Qt\4.7.2}.
     187    e.g. \c{C:\Qt\4.7.3}.
    188188
    189189    \note The install path must not contain any spaces or Windows specific
    … …  
    197197\snippet doc/src/snippets/code/doc_src_installation.qdoc 7
    198198
    199     This is done by adding \c{c:\Qt\4.7.2\bin} to the \c PATH variable.
     199    This is done by adding \c{c:\Qt\4.7.3\bin} to the \c PATH variable.
    200200
    201201    For newer versions of Windows, \c PATH can be extended through
    … …  
    297297
    298298    Unpack the archive if you have not done so already. For example,
    299     if you have the \c{qt-everywhere-opensource-src-4.7.2.tar.gz}
     299    if you have the \c{qt-everywhere-opensource-src-4.7.3.tar.gz}
    300300    package, type the following commands at a command line prompt:
    301301
    302302\snippet doc/src/snippets/code/doc_src_installation.qdoc 11
    303303
    304     This creates the directory \c{/tmp/qt-everywhere-opensource-src-4.7.2}
     304    This creates the directory \c{/tmp/qt-everywhere-opensource-src-4.7.3}
    305305    containing the files from the archive.
    306306
    … …  
    311311
    312312    By default, Qt is configured for installation in the
    313     \c{/usr/local/Trolltech/Qt-4.7.2} directory, but this can be
     313    \c{/usr/local/Trolltech/Qt-4.7.3} directory, but this can be
    314314    changed by using the \c{-prefix} option.
    315315
    … …  
    405405\section1 Step 1: Install the License File (commercial editions only)
    406406    Uncompress the files into the directory you want to install Qt into;
    407     e.g., \c{C:\Qt\4.7.2}.
     407    e.g., \c{C:\Qt\4.7.3}.
    408408
    409409    \note The install path must not contain any spaces.
    … …  
    415415
    416416\snippet doc/src/snippets/code/doc_src_installation.qdoc 18
    417     This is done by adding \c{c:\Qt\4.7.2\bin} to the \c PATH variable.
     417    This is done by adding \c{c:\Qt\4.7.3\bin} to the \c PATH variable.
    418418
    419419    For newer versions of Windows, \c PATH can be extended through
    … …  
    506506\section1 Step 1: Install Qt
    507507
    508         Run \c{qt-symbian-opensource-4.7.2.exe} and follow the instructions.
     508        Run \c{qt-symbian-opensource-4.7.3.exe} and follow the instructions.
    509509
    510510        \note Qt must be installed on the same drive as the Symbian SDK you are
    … …  
    586586
    587587    Uncompress the \l{http://qt.nokia.com/downloads}{downloaded} source
    588     package into the directory you want Qt installed, e.g. \c{C:\Qt\4.7.2}.
     588    package into the directory you want Qt installed, e.g. \c{C:\Qt\4.7.3}.
    589589
    590590    \note Qt must be installed on the same drive as the Symbian SDK you are
    … …  
    598598\snippet doc/src/snippets/code/doc_src_installation.qdoc 18
    599599
    600     This is done by adding \c{c:\Qt\4.7.2\bin} to the \c PATH variable.
     600    This is done by adding \c{c:\Qt\4.7.3\bin} to the \c PATH variable.
    601601
    602602    On Windows the\c PATH can be extended by navigating to
    … …  
    711711
    712712Uncompress the \l{http://qt.nokia.com/downloads}{downloaded} source package into the
    713 directory you want Qt installed, e.g. \c{/home/user/qt/4.7.2}.
     713directory you want Qt installed, e.g. \c{/home/user/qt/4.7.3}.
    714714
    715715

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

    r846 r865  
    7676
    7777    Note that by default, \l{Qt for Embedded Linux} is configured for
    78     installation in the \c{/usr/local/Trolltech/QtEmbedded-4.7.2}
     78    installation in the \c{/usr/local/Trolltech/QtEmbedded-4.7.3}
    7979    directory, but this can be changed by using the \c{-prefix}
    8080    option. Alternatively, the \c{-prefix-install} option can be used
    … …  
    136136    For compilers that do not support \c rpath you must also extend
    137137    the \c LD_LIBRARY_PATH environment variable to include
    138     \c /usr/local/Trolltech/QtEmbedded-4.7.2/lib. Note that on Linux
     138    \c /usr/local/Trolltech/QtEmbedded-4.7.3/lib. Note that on Linux
    139139    with GCC, this step is not needed.
    140140

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

    r846 r865  
    390390    \section1 Windows Vista
    391391
    392     At the time Qt 4.7.2 was released, there were no known Vista-specific issues.
     392    At the time Qt 4.7.3 was released, there were no known Vista-specific issues.
    393393
    394394    \target Windows NT

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

    r846 r865  
    200200    \o The shadow build directory must be on the same level as the Qt source
    201201        package.\br
    202     If the Qt package is in \c{C:\Qt\4.7.2} the shadow build directory
     202    If the Qt package is in \c{C:\Qt\4.7.3} the shadow build directory
    203203    could be \c{C:\Qt\shadowbuild}. A shadow build from a directory like
    204204    \c{C:\shadowbuild} will not compile.
    … …  
    211211    \endlist
    212212
    213     So lets assume you have installed Qt in \c{C:\Qt\4.7.2} and you want
     213    So lets assume you have installed Qt in \c{C:\Qt\4.7.3} and you want
    214214    to create a shadow build in \c{C:\Qt\mobile5-shadow}:
    215215

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

    r846 r865  
    624624    included in the \c changes-4.6.0 file
    625625    \l{http://qt.nokia.com/developer/changes/changes-4.6.0}{available
    626     online}. A \l{Known Issues in 4.7.2}{list of known issues}
     626    online}. A \l{Known Issues in 4.7.3}{list of known issues}
    627627    for this release is also available.
    628628
    629629    Changes between this release and the previous release are provided
    630     in the \c{changes-4.7.2} file (also
    631     \l{http://qt.nokia.com/developer/changes/changes-4.7.2}{available online}).
     630    in the \c{changes-4.7.3} file (also
     631    \l{http://qt.nokia.com/developer/changes/changes-4.7.3}{available online}).
    632632\endomit
    633633
    … …  
    834834    in the \c changes-4.5.0 file
    835835    \l{http://qt.nokia.com/developer/changes/changes-4.5.0}{available online}.
    836     A \l{Known Issues in 4.7.2}{list of known issues} for this release is also
     836    A \l{Known Issues in 4.7.3}{list of known issues} for this release is also
    837837    available.
    838838
    839839    Changes between this release and the previous release are provided
    840     in the \c{changes-4.7.2} file (also
    841     \l{http://qt.nokia.com/developer/changes/changes-4.7.2}{available online}).
     840    in the \c{changes-4.7.3} file (also
     841    \l{http://qt.nokia.com/developer/changes/changes-4.7.3}{available online}).
    842842
    843843    A list of other Qt 4 features can be found on the

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

    r846 r865  
    4141//! [0]
    4242cd <anywhere>
    43 gunzip qt-everywhere-opensource-src-4.7.2.tar.gz
    44 tar xf qt-everywhere-opensource-src-4.7.2.tar
     43gunzip qt-everywhere-opensource-src-4.7.3.tar.gz
     44tar xf qt-everywhere-opensource-src-4.7.3.tar
    4545//! [0]
    4646
    4747
    4848//! [1]
    49 ~/qt-everywhere-opensource-src-4.7.2
     49~/qt-everywhere-opensource-src-4.7.3
    5050//! [1]
    5151
    … …  
    5656
    5757//! [2]
    58 cd  ~/qt-everywhere-opensource-src-4.7.2
     58cd  ~/qt-everywhere-opensource-src-4.7.3
    5959./configure -embedded [architecture]
    6060//! [2]
    … …  
    7272
    7373//! [5]
    74 PATH=/usr/local/Trolltech/QtEmbedded-4.7.2/bin:$PATH
     74PATH=/usr/local/Trolltech/QtEmbedded-4.7.3/bin:$PATH
    7575export PATH
    7676//! [5]
    … …  
    7878
    7979//! [6]
    80 setenv PATH /usr/local/Trolltech/QtEmbedded-4.7.2/bin:$PATH
     80setenv PATH /usr/local/Trolltech/QtEmbedded-4.7.3/bin:$PATH
    8181//! [6]

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

    r846 r865  
    4141//! [0]
    4242cd /tmp
    43 gunzip qt-everywhere-opensource-src-4.7.2.tar.gz        # uncompress the archive
    44 tar xvf qt-everywhere-opensource-src-4.7.2.tar          # unpack it
     43gunzip qt-everywhere-opensource-src-4.7.3.tar.gz        # uncompress the archive
     44tar xvf qt-everywhere-opensource-src-4.7.3.tar          # unpack it
    4545//! [0]
    4646
    4747
    4848//! [1]
    49 cd /tmp/qt-everywhere-opensource-src-4.7.2
     49cd /tmp/qt-everywhere-opensource-src-4.7.3
    5050./configure
    5151//! [1]
    … …  
    6868
    6969//! [5]
    70 PATH=/usr/local/Trolltech/Qt-4.7.2/bin:$PATH
     70PATH=/usr/local/Trolltech/Qt-4.7.3/bin:$PATH
    7171export PATH
    7272//! [5]
    … …  
    7474
    7575//! [6]
    76 setenv PATH /usr/local/Trolltech/Qt-4.7.2/bin:$PATH
     76setenv PATH /usr/local/Trolltech/Qt-4.7.3/bin:$PATH
    7777//! [6]
    7878
    … …  
    8585//! [8]
    8686C:
    87 cd /D C:\Qt\4.7.2
     87cd /D C:\Qt\4.7.3
    8888configure
    8989//! [8]
    … …  
    102102//! [11]
    103103cd /tmp
    104 gunzip qt-everywhere-opensource-src-4.7.2.tar.gz        # uncompress the archive
    105 tar xvf qt-everywhere-opensource-src-4.7.2.tar          # unpack it
     104gunzip qt-everywhere-opensource-src-4.7.3.tar.gz        # uncompress the archive
     105tar xvf qt-everywhere-opensource-src-4.7.3.tar          # unpack it
    106106//! [11]
    107107
    108108
    109109//! [12]
    110 cd /tmp/qt-everywhere-opensource-src-4.7.2
     110cd /tmp/qt-everywhere-opensource-src-4.7.3
    111111./configure
    112112//! [12]
    … …  
    129129
    130130//! [16]
    131 PATH=/usr/local/Trolltech/Qt-4.7.2/bin:$PATH
     131PATH=/usr/local/Trolltech/Qt-4.7.3/bin:$PATH
    132132export PATH
    133133//! [16]
    … …  
    135135
    136136//! [17]
    137 setenv PATH /usr/local/Trolltech/Qt-4.7.2/bin:$PATH
     137setenv PATH /usr/local/Trolltech/Qt-4.7.3/bin:$PATH
    138138//! [17]
    139139
    … …  
    146146//! [19]
    147147C:
    148 cd \Qt\4.7.2
     148cd \Qt\4.7.3
    149149configure -platform win32-msvc2005 -xplatform wincewm50pocket-msvc2005
    150150//! [19]
    … …  
    169169
    170170//! [23]
    171 cd \Qt\4.7.2
     171cd \Qt\4.7.3
    172172configure -platform win32-g++ -xplatform symbian-abld
    173173//! [23]
    … …  
    208208
    209209//! [31]
    210 cd \Qt\4.7.2
     210cd \Qt\4.7.3
    211211configure -platform win32-g++ -xplatform symbian-sbsv2
    212212//! [31]
    … …  
    245245
    246246//! [37]
    247 PATH=/home/user/qt/4.7.2/bin:$EPOCROOT/epoc32/tools:$PATH
     247PATH=/home/user/qt/4.7.3/bin:$EPOCROOT/epoc32/tools:$PATH
    248248export PATH
    249249//! [37]
    250250
    251251//! [38]
    252 cd /home/user/qt/4.7.2
     252cd /home/user/qt/4.7.3
    253253./configure -platform linux-g++ -xplatform symbian/linux-armcc
    254254//! [38]
    255255
    256256//! [39]
    257 cd /home/user/qt/4.7.2
     257cd /home/user/qt/4.7.3
    258258./configure -platform linux-g++ -xplatform symbian/linux-gcce -no-webkit
    259259//! [39]

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

    r846 r865  
    110110//! [10]
    111111********* Start testing of TestQString *********
    112 Config: Using QTest library 4.7.2, Qt 4.7.2
     112Config: Using QTest library 4.7.3, Qt 4.7.3
    113113PASS   : TestQString::initTestCase()
    114114PASS   : TestQString::toUpper()

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

    r846 r865  
    6262//! [4]
    6363cd c:\Qt\mobile5-shadow
    64 C:\Qt\4.7.2\configure.exe -platform win32-msvc2005 -xplatform wincewm50pocket-msvc2005 -release
     64C:\Qt\4.7.3\configure.exe -platform win32-msvc2005 -xplatform wincewm50pocket-msvc2005 -release
    6565//! [4]
    6666
Note: See TracChangeset for help on using the changeset viewer.