summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2009-12-11 11:11:45 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2009-12-11 11:11:45 (GMT)
commitb42da2ec8677ce67ecd5d5f8188537e2a597da2a (patch)
treee41b2eb449e0d0392e85603612836d935967f400 /doc/src/snippets/code
parent664c78144754c499d07a95c3914fd34202bf4b98 (diff)
parent343de9228ae65c36c4a9a45297d45cdeb04a8e44 (diff)
downloadQt-b42da2ec8677ce67ecd5d5f8188537e2a597da2a.zip
Qt-b42da2ec8677ce67ecd5d5f8188537e2a597da2a.tar.gz
Qt-b42da2ec8677ce67ecd5d5f8188537e2a597da2a.tar.bz2
Merge branch '4.6' of 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.qdoc12
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]