summaryrefslogtreecommitdiffstats
path: root/doc/src/getting-started
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-12-08 19:29:13 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-12-08 19:29:13 (GMT)
commit258bc1c288ec9be90a2a101b81f0a3c58d193bca (patch)
tree60dc482094a9dbf9d8182c4a2c3c0d820788fca6 /doc/src/getting-started
parent3bce78f6e143883fdba413e134504485594e73b3 (diff)
parentaf9304af3c462e120373f864d637e9c1db0787e2 (diff)
downloadQt-258bc1c288ec9be90a2a101b81f0a3c58d193bca.zip
Qt-258bc1c288ec9be90a2a101b81f0a3c58d193bca.tar.gz
Qt-258bc1c288ec9be90a2a101b81f0a3c58d193bca.tar.bz2
Merge branch '4.6'
Diffstat (limited to 'doc/src/getting-started')
-rw-r--r--doc/src/getting-started/installation.qdoc8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index beb4419..b052c3c 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -66,12 +66,12 @@ in the \l{Qt for X11 Requirements} document.
For the open source version you do not need a license file.
\o Unpack the archive if you have not done so already. For example,
- if you have the \c{qt-x11-opensource-desktop-%VERSION%.tar.gz}
+ if you have the \c{qt-everywhere-opensource-src-%VERSION%.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-x11-opensource-desktop-%VERSION%}
+ This creates the directory \c{/tmp/qt-everywhere-opensource-src-%VERSION%}
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.
@@ -299,12 +299,12 @@ The following instructions describe how to install Qt from the source package.
For the open source version you do not need a license file.
\o Unpack the archive if you have not done so already. For example,
- if you have the \c{qt-mac-opensource-desktop-%VERSION%.tar.gz}
+ if you have the \c{qt-everywhere-opensource-src-%VERSION%.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-mac-opensource-desktop-%VERSION%}
+ This creates the directory \c{/tmp/qt-everywhere-opensource-src-%VERSION%}
containing the files from the archive.
\o Building