Changeset 865 for trunk/doc/src/getting-started

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:

• . (modified) (1 prop)
• doc/src/getting-started/installation.qdoc (modified) (13 diffs)

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

@@ -59 +59 @@
 \section1 Step 2: Unpacking the Archive
     Unpack the archive if you have not done so already. For example,
-    if you have the \c{qt-everywhere-opensource-src-4.7.2.tar.gz}
+    if you have the \c{qt-everywhere-opensource-src-4.7..tar.gz}
     package, type the following commands at a command line prompt:
 
 \snippet doc/src/snippets/code/doc_src_installation.qdoc 0
 
-    This creates the directory \c{/tmp/qt-everywhere-opensource-src-4.7.2}
+    This creates the directory \c{/tmp/qt-everywhere-opensource-src-4.7.}
     containing the files from the archive. We only support the GNU version of
     the tar archiving utility. Note that on some systems it is called gtar.
@@ -74 +74 @@
 
     By default, Qt is configured for installation in the
-    \c{/usr/local/Trolltech/Qt-4.7.2} directory, but this can be
+    \c{/usr/local/Trolltech/Qt-4.7.} directory, but this can be
     changed by using the \c{-prefix} option.
 
@@ -124 +124 @@
     For compilers that do not support rpath you must also extended the
     \c LD_LIBRARY_PATH environment variable to include
-    \c{/usr/local/Trolltech/Qt-4.7.2/lib}. On Linux with GCC this step
+    \c{/usr/local/Trolltech/Qt-4.7./lib}. On Linux with GCC this step
     is not needed.
 
@@ -185 +185 @@
 
     Uncompress the files into the directory you want Qt installed;
-    e.g. \c{C:\Qt\4.7.2}.
+    e.g. \c{C:\Qt\4.7.}.
 
     \note The install path must not contain any spaces or Windows specific
@@ -197 +197 @@
 \snippet doc/src/snippets/code/doc_src_installation.qdoc 7
 
-    This is done by adding \c{c:\Qt\4.7.2\bin} to the \c PATH variable.
+    This is done by adding \c{c:\Qt\4.7.\bin} to the \c PATH variable.
 
     For newer versions of Windows, \c PATH can be extended through
@@ -297 +297 @@
 
     Unpack the archive if you have not done so already. For example,
-    if you have the \c{qt-everywhere-opensource-src-4.7.2.tar.gz}
+    if you have the \c{qt-everywhere-opensource-src-4.7..tar.gz}
     package, type the following commands at a command line prompt:
 
 \snippet doc/src/snippets/code/doc_src_installation.qdoc 11
 
-    This creates the directory \c{/tmp/qt-everywhere-opensource-src-4.7.2}
+    This creates the directory \c{/tmp/qt-everywhere-opensource-src-4.7.}
     containing the files from the archive.
 
@@ -311 +311 @@
 
     By default, Qt is configured for installation in the
-    \c{/usr/local/Trolltech/Qt-4.7.2} directory, but this can be
+    \c{/usr/local/Trolltech/Qt-4.7.} directory, but this can be
     changed by using the \c{-prefix} option.
 
@@ -405 +405 @@
 \section1 Step 1: Install the License File (commercial editions only)
     Uncompress the files into the directory you want to install Qt into;
-    e.g., \c{C:\Qt\4.7.2}.
+    e.g., \c{C:\Qt\4.7.}.
 
     \note The install path must not contain any spaces.
@@ -415 +415 @@
 
 \snippet doc/src/snippets/code/doc_src_installation.qdoc 18
-    This is done by adding \c{c:\Qt\4.7.2\bin} to the \c PATH variable.
+    This is done by adding \c{c:\Qt\4.7.\bin} to the \c PATH variable.
 
     For newer versions of Windows, \c PATH can be extended through
@@ -506 +506 @@
 \section1 Step 1: Install Qt
 
-        Run \c{qt-symbian-opensource-4.7.2.exe} and follow the instructions.
+        Run \c{qt-symbian-opensource-4.7..exe} and follow the instructions.
 
         \note Qt must be installed on the same drive as the Symbian SDK you are
@@ -586 +586 @@
 
     Uncompress the \l{http://qt.nokia.com/downloads}{downloaded} source 
-    package into the directory you want Qt installed, e.g. \c{C:\Qt\4.7.2}.
+    package into the directory you want Qt installed, e.g. \c{C:\Qt\4.7.}.
 
     \note Qt must be installed on the same drive as the Symbian SDK you are
@@ -598 +598 @@
 \snippet doc/src/snippets/code/doc_src_installation.qdoc 18
 
-    This is done by adding \c{c:\Qt\4.7.2\bin} to the \c PATH variable.
+    This is done by adding \c{c:\Qt\4.7.\bin} to the \c PATH variable.
 
     On Windows the\c PATH can be extended by navigating to
@@ -711 +711 @@
 
 Uncompress the \l{http://qt.nokia.com/downloads}{downloaded} source package into the
-directory you want Qt installed, e.g. \c{/home/user/qt/4.7.2}.
+directory you want Qt installed, e.g. \c{/home/user/qt/4.7.}.