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

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:

• . (modified) (1 prop)
• doc/src/getting-started/examples.qdoc (modified) (2 diffs)
• doc/src/getting-started/installation.qdoc (modified) (18 diffs)
• doc/src/getting-started/known-issues.qdoc (modified) (1 diff)

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

@@ -407 +407 @@
     \section1 \l{D-Bus Examples}{D-Bus}
     \beginfloatleft
-    \l{D-Bus Examples}{\inlineimage qt-embedded-examples.png
+    \l{D-Bus Examples}{\inlineimage -examples.png
     }
 
@@ -417 +417 @@
     \section1 \l{Qt for Embedded Linux Examples}{Qt for Embedded Linux}
     \beginfloatleft
-    \l{Qt for Embedded Linux Examples}{\inlineimage dbus-examples.png
+    \l{Qt for Embedded Linux Examples}{\inlineimage -examples.png
     }
 

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

@@ -67 +67 @@
 
 \o  Unpack the archive if you have not done so already. For example,
-    if you have the \c{qt-everywhere-opensource-src-4.6.2.tar.gz}
+    if you have the \c{qt-everywhere-opensource-src-4.6..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.6.2}
+    This creates the directory \c{/tmp/qt-everywhere-opensource-src-4.6.}
     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.
@@ -82 +82 @@
 
     By default, Qt is configured for installation in the
-    \c{/usr/local/Trolltech/Qt-4.6.2} directory, but this can be
+    \c{/usr/local/Trolltech/Qt-4.6.} directory, but this can be
     changed by using the \c{-prefix} option.
 
@@ -134 +134 @@
     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.6.2/lib}. On Linux with GCC this step
+    \c{/usr/local/Trolltech/Qt-4.6./lib}. On Linux with GCC this step
     is not needed.
 
@@ -194 +194 @@
 
 \o  Uncompress the files into the directory you want Qt installed;
-    e.g. \c{C:\Qt\4.6.2}.
+    e.g. \c{C:\Qt\4.6.}.
 
     \note The install path must not contain any spaces or Windows specific
@@ -206 +206 @@
 \snippet doc/src/snippets/code/doc_src_installation.qdoc 7
 
-    This is done by adding \c{c:\Qt\4.6.2\bin} to the \c PATH variable.
+    This is done by adding \c{c:\Qt\4.6.\bin} to the \c PATH variable.
 
     For newer versions of Windows, \c PATH can be extended through
@@ -300 +300 @@
 
 \o  Unpack the archive if you have not done so already. For example,
-    if you have the \c{qt-everywhere-opensource-src-4.6.2.tar.gz}
+    if you have the \c{qt-everywhere-opensource-src-4.6..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.6.2}
+    This creates the directory \c{/tmp/qt-everywhere-opensource-src-4.6.}
     containing the files from the archive.
 
@@ -314 +314 @@
 
     By default, Qt is configured for installation in the
-    \c{/usr/local/Trolltech/Qt-4.6.2} directory, but this can be
+    \c{/usr/local/Trolltech/Qt-4.6.} directory, but this can be
     changed by using the \c{-prefix} option.
 
@@ -407 +407 @@
 \list 1
     \o  Uncompress the files into the directory you want to install Qt into;
-        e.g., \c{C:\Qt\4.6.2}.
+        e.g., \c{C:\Qt\4.6.}.
 
         \note The install path must not contain any spaces.
@@ -418 +418 @@
         \snippet doc/src/snippets/code/doc_src_installation.qdoc 18
 
-        This is done by adding \c{c:\Qt\4.6.2\bin} to the \c PATH variable.
+        This is done by adding \c{c:\Qt\4.6.\bin} to the \c PATH variable.
 
         For newer versions of Windows, \c PATH can be extended through
@@ -507 +507 @@
     \o  Install Qt
 
-        Run \c{qt-symbian-opensource-4.6.2.exe} and follow the instructions.
+        Run \c{qt-symbian-opensource-4.6..exe} and follow the instructions.
 
         \note Qt must be installed on the same drive as the Symbian SDK you are
@@ -587 +587 @@
 
         Uncompress the \l{http://qt.nokia.com/downloads}{downloaded} source package into the
-        directory you want Qt installed, e.g. \c{C:\Qt\4.6.2}.
+        directory you want Qt installed, e.g. \c{C:\Qt\4.6.}.
 
         \note Qt must be installed on the same drive as the Symbian SDK you are
@@ -599 +599 @@
         \snippet doc/src/snippets/code/doc_src_installation.qdoc 18
 
-        This is done by adding \c{c:\Qt\4.6.2\bin} to the \c PATH variable.
+        This is done by adding \c{c:\Qt\4.6.\bin} to the \c PATH variable.
 
         On Windows the PATH can be extended by navigating to
@@ -755 +755 @@
     \endlist
 
-    \sa {Known Issues in 4.6.2}
+    \sa {Known Issues in 4.6.}
 */
 
@@ -765 +765 @@
     \previouspage General Qt Requirements
 
-    \sa {Known Issues in 4.6.2}
+    \sa {Known Issues in 4.6.}
 */
 
@@ -904 +904 @@
     distribution's package repository to find suitable packages.
 
-    \sa {Known Issues in 4.6.2}
+    \sa {Known Issues in 4.6.}
 */
 
@@ -958 +958 @@
     \l{Windows CE - Working with Custom SDKs}{here}.
 
-    \sa {Known Issues in 4.6.2}
+    \sa {Known Issues in 4.6.}
 */
 
@@ -968 +968 @@
     \previouspage General Qt Requirements
 
-    \sa {Known Issues in 4.6.2}
+    \sa {Known Issues in 4.6.}
 
     \section1 Building Qt for Embedded Linux with uclibc
@@ -1068 +1068 @@
     to get more information about how to setup the development environment.
 
-    \sa {Known Issues in 4.6.2}
-*/
+    \sa {Known Issues in 4.6.}
+*/

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

@@ -42 +42 @@
 /*!
     \page known-issues.html
-    \title Known Issues in 4.6.2
+    \title Known Issues in 4.6.
     \ingroup platform-specific
-    \brief A summary of known issues in Qt 4.6.2 at the time of release.
+    \brief A summary of known issues in Qt 4.6. at the time of release.
 
-    An up-to-date list of known issues with Qt 4.6.2 can be found via the
+    An up-to-date list of known issues with Qt 4.6. can be found via the
     \l{http://bugreports.qt.nokia.com/}{Qt Bug Tracker}.
 
-    For a list list of known bugs in Qt 4.6.2, see the \l{Task Tracker}
+    For a list list of known bugs in Qt 4.6., see the \l{Task Tracker}
     on the Qt website.