diff options
author | Gunnar Sletta <gunnar@trolltech.com> | 2009-12-09 14:16:24 (GMT) |
---|---|---|
committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-12-09 14:16:24 (GMT) |
commit | 0dfb4c79dd6fb23fea5277c687485d43b0f91e3f (patch) | |
tree | a921b61578cfca0e2fff7ed074819294988ebae2 /doc/src/snippets/code | |
parent | 0c30418556d978f730c33aa3bb066961981ccc9b (diff) | |
parent | 7fecd890ce50d86120566acc7e71fcac915a671f (diff) | |
download | Qt-0dfb4c79dd6fb23fea5277c687485d43b0f91e3f.zip Qt-0dfb4c79dd6fb23fea5277c687485d43b0f91e3f.tar.gz Qt-0dfb4c79dd6fb23fea5277c687485d43b0f91e3f.tar.bz2 |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'doc/src/snippets/code')
-rw-r--r-- | doc/src/snippets/code/doc_src_installation.qdoc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc index bef6e84..c810706 100644 --- a/doc/src/snippets/code/doc_src_installation.qdoc +++ b/doc/src/snippets/code/doc_src_installation.qdoc @@ -41,13 +41,13 @@ //! [0] cd /tmp -gunzip qt-x11-opensource-desktop-%VERSION%.tar.gz # uncompress the archive -tar xvf qt-x11-opensource-desktop-%VERSION%.tar # unpack it +gunzip qt-everywhere-opensource-src-%VERSION%.tar.gz # uncompress the archive +tar xvf qt-everywhere-opensource-src-%VERSION%.tar # unpack it //! [0] //! [1] -cd /tmp/qt-x11-opensource-desktop-%VERSION% +cd /tmp/qt-everywhere-opensource-src-%VERSION% ./configure //! [1] @@ -102,13 +102,13 @@ nmake //! [11] cd /tmp -gunzip qt-mac-opensource-desktop-%VERSION%.tar.gz # uncompress the archive -tar xvf qt-mac-opensource-desktop-%VERSION%.tar # unpack it +gunzip qt-everywhere-opensource-src-%VERSION%.tar.gz # uncompress the archive +tar xvf qt-everywhere-opensource-src-%VERSION%.tar # unpack it //! [11] //! [12] -cd /tmp/qt-mac-opensource-desktop-%VERSION% +cd /tmp/qt-everywhere-opensource-src-%VERSION% ./configure //! [12] |