diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-12-15 14:40:07 (GMT) |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-12-15 14:40:07 (GMT) |
commit | d869ec981447bc6d590954a939f18b5d37ebb6cd (patch) | |
tree | b2b0bf2ccd1f5d886340475b70c9a91b2e456ebd /doc/src/snippets/code | |
parent | 2ba459c2adcaa4d0f865956048ac2e24f3fe6924 (diff) | |
parent | 0b402f10a26115332ae72bbf263fd15c8354ecb9 (diff) | |
download | Qt-d869ec981447bc6d590954a939f18b5d37ebb6cd.zip Qt-d869ec981447bc6d590954a939f18b5d37ebb6cd.tar.gz Qt-d869ec981447bc6d590954a939f18b5d37ebb6cd.tar.bz2 |
Merge remote branch 'mainline/4.6' 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] |