diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-12-09 09:55:54 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-12-09 09:55:54 (GMT) |
| commit | 1cfa8d81f04e02860df85a3b7acf41974982adae (patch) | |
| tree | 01282181ab20b7637ceb75d0c26cef15d1d916b5 /doc/src/snippets/code | |
| parent | 934d4b9852060b2870f6774cd854331422147d3e (diff) | |
| parent | eea71824f57dd61b0a513e3bbb5ced99de505d73 (diff) | |
| download | Qt-1cfa8d81f04e02860df85a3b7acf41974982adae.zip Qt-1cfa8d81f04e02860df85a3b7acf41974982adae.tar.gz Qt-1cfa8d81f04e02860df85a3b7acf41974982adae.tar.bz2 | |
Merge upstream/4.6 into oslo-staging-2/4.6
Conflicts:
src/s60installs/bwins/QtGuiu.def
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] |