Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6

3 files changed, 11 insertions, 14 deletions

diff --git a/doc/doc.pri b/doc/doc.pri
index d4fdcd8..463c447 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -34,12 +34,9 @@ win32-g++:isEmpty(QMAKE_SH) {
 	QT_DOCUMENTATION = $$replace(QT_DOCUMENTATION, "/", "\\\\")
 }
 
-
-!wince*:!cross_compile:SUBDIRS += tools/qdoc3
-
 # Build rules:
 adp_docs.commands = ($$QDOC $$ADP_DOCS_QDOCCONF_FILE)
-adp_docs.depends += sub-tools-qdoc3
+adp_docs.depends += sub-tools # qdoc3
 qch_docs.commands = $$QT_DOCUMENTATION
 qch_docs.depends += sub-tools
 
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
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]