Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into qt-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (32 commits)
  Fixes internal drag and drop in QListWidget while dropping to the end
  Fix spinbox input when seecting the prefix
  Clean up the QFontEngine glyphcaching code to not crash and be more tidy
  Doc: The ctor of of QGraphicsLayout might install the layout.
  Doc: Try to explain better when and how the easing curve is applied
  Recreate VGImage properly in out of memory case
  Fix a crash on the focus chain when removing items from the scene.
  Fix crash when rotating cleartype text under gl engine.
  Don't assert on valid math in qbezier
  Fixed a regression in dock widget resizing
  GLES 2 should *not* use a multisampled format by default.
  Compile with QT_NO_DEPRECATED
  Use 64bit for the connectedSignals
  Fix regression in qVariantFromValue when converting from complex type to simple type
  Clean up debug message with DirectFB
  Enable customizing of DirectFB layer to use
  Set stacking class for stays-on-top windows in DFB
  Fixed (unstable) tst_QTimeLine::currentTime test failure
  Speed up rotated/transformed text on OpenGL2 paint engine
  Def file updates
  ...

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]