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

2 files changed, 31 insertions, 17 deletions

diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 057629d..beb4419 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -423,7 +423,7 @@ in the \l{Qt for Windows CE Requirements} document.
         "Control Panel->System->Advanced->Environment variables" and for
         older versions by editing \c{c:\autoexec.bat}.
 
-        Make sure the enviroment variables for your compiler are set. 
+        Make sure the enviroment variables for your compiler are set.
         Visual Studio includes \c{vcvars32.bat} for that purpose - or simply
         use the "Visual Studio Command Prompt" from the Start menu.
 
@@ -530,7 +530,7 @@ in the \l{Qt for the Symbian platform Requirements} document.
 
         \snippet doc/src/snippets/code/doc_src_installation.qdoc 25
 
-        To run the demos on the emulator simply navigate to the directory of the demo 
+        To run the demos on the emulator simply navigate to the directory of the demo
         you want to see and run:
 
         \snippet doc/src/snippets/code/doc_src_installation.qdoc 27
@@ -554,7 +554,7 @@ Symbian platform,
 in the \l{Qt for the Symbian platform Requirements} document.
 
 \note \bold {This document describes how to install and configure Qt for
-the Symbian platform from scratch. 
+the Symbian platform from scratch.
 If you are using pre-built binaries, follow the instructions given in the
 \l{Installing Qt on the Symbian platform from a Binary Package} document.}
 
@@ -616,7 +616,7 @@ If you are using pre-built binaries, follow the instructions given in the
         \snippet doc/src/snippets/code/doc_src_installation.qdoc 31
         to build the tools using MinGW, and the libraries using SBSv2.
 
-        SBSv2 also known as a (\l{http://developer.symbian.org/wiki/index.php/Introduction_to_RAPTOR} {Raptor})
+        SBSv2 (also known as \l{http://developer.symbian.org/wiki/index.php/Introduction_to_RAPTOR} {Raptor})
         is a next-generation Symbian build system. SBSv2 is not officially
         supported by any of the S60 SDKs currently available from Forum Nokia.
 
@@ -641,8 +641,8 @@ If you are using pre-built binaries, follow the instructions given in the
 
         \snippet doc/src/snippets/code/doc_src_installation.qdoc 29
 
-        \note You will need to supply certificate that allows installation 
-        of binaries with "All -Tcb" capability to your device. 
+        \note You will need to supply certificate that allows installation
+        of binaries with "All -Tcb" capability to your device.
 
         Similarly, install fluidlauncher to the device:
 
@@ -651,7 +651,7 @@ If you are using pre-built binaries, follow the instructions given in the
         This will create a self-signed \c fluidlauncher_armv5_urel.sis and
         install it to your device.
 
-        To run the demos on the emulator simply navigate to the directory of the demo 
+        To run the demos on the emulator simply navigate to the directory of the demo
         you want to see and run:
 
         \snippet doc/src/snippets/code/doc_src_installation.qdoc 27
@@ -711,6 +711,10 @@ If you are using pre-built binaries, follow the instructions given in the
     \l{http://www.microsoft.com/downloads/details.aspx?FamilyId=BB4A75AB-E2D4-4C96-B39D-37BAF6B5B1DC&displaylang=en}{here}
     to avoid runtime conflicts.
 
+    If you are using a source code package of Qt, you must first install Perl so 
+    that the syncqt script invoked by configure can be executed. You can download
+    this \l{http://www.activestate/downloads/}{here}.  
+
     To build Qt with Phonon on Windows, you require:
 
     \list
@@ -827,7 +831,7 @@ If you are using pre-built binaries, follow the instructions given in the
     when building Qt from its source code. On Debian-based GNU/Linux systems,
     for example, we recommend that you install the following development
     packages:
-    
+
     \list
     \o libfontconfig1-dev
     \o libfreetype6-dev
@@ -850,7 +854,7 @@ If you are using pre-built binaries, follow the instructions given in the
     The configure script will autodetect if OpenGL headers and libraries are
     installed on your system, and if so, it will include the QtOpenGL module
     in the Qt library.
-    
+
     If your OpenGL headers or libraries are placed in a non-standard directory,
     you may need to change the \c QMAKE_INCDIR_OPENGL and/or
     \c QMAKE_LIBDIR_OPENGL in the config file for your system.
@@ -954,7 +958,7 @@ If you are using pre-built binaries, follow the instructions given in the
 
     \table
     \header \o{1,2} Architecture \o{1,2} Compiler  \o{2,1} QtCore       \o{2,1} QtGui        \o{2,1} QtNetwork    \o{2,1} QtWebKit
-    \header                                        \o Minimal \o Normal \o Minimal \o Normal \o Minimal \o Normal \o Minimal \o Normal 
+    \header                                        \o Minimal \o Normal \o Minimal \o Normal \o Minimal \o Normal \o Minimal \o Normal
     \row    \o linux-x86-g++ \o GCC 4.2.4          \o 1.7M    \o 2.7M   \o 3.3M    \o 9.9M   \o 653K    \o 1.1M   \o N/A     \o 17M
     \row    \o linux-arm-g++ \o GCC 4.1.1          \o 1.9M    \o 3.2M   \o 4.1M    \o 11M    \o 507K    \o 1.0M   \o N/A     \o 17M
     \row    \o linux-mips-g++ (MIPS32)
@@ -984,7 +988,7 @@ If you are using pre-built binaries, follow the instructions given in the
 
     Qt for the Symbian platform requires the following software installed on your development PC:
     \list
-        \o \l{http://www.forum.nokia.com/main/resources/tools_and_sdks/carbide_cpp/}{Carbide.c++ v2.0.0 or higher}           
+        \o \l{http://www.forum.nokia.com/main/resources/tools_and_sdks/carbide_cpp/}{Carbide.c++ v2.0.0 or higher}
            \list
            \o \bold{Note:} It may be necessary to update the Carbide compiler.
               See \l{http://pepper.troll.no/s60prereleases/patches/}{here} for instructions how to check your
@@ -1006,7 +1010,7 @@ If you are using pre-built binaries, follow the instructions given in the
            \o \bold{Note:} This is not required if you are using pre-built binary package.
            \endlist
         \o Building Qt libraries requires \l{http://www.arm.com/products/DevTools/RVCT.html}{RVCT} 2.2 [build 686] or later,
-           which is not available free of charge. 
+           which is not available free of charge.
     \endlist
 
     Running Qt on real device requires the following packages to be installed on your device.
diff --git a/doc/src/getting-started/known-issues.qdoc b/doc/src/getting-started/known-issues.qdoc
index b8c2192..7ae6d34 100644
--- a/doc/src/getting-started/known-issues.qdoc
+++ b/doc/src/getting-started/known-issues.qdoc
@@ -45,16 +45,14 @@
     \ingroup platform-specific
     \brief A summary of known issues in Qt %VERSION% at the time of release.
 
-    This page documents known problems with the packaging and installation in
-    Qt %VERSION%, as well as issues with third party software that we have
-    not been able to work around. For a list of such issues in previous Qt
-    versions refer to this page in the respective documentation.
+    An up-to-date list of known issues with Qt %VERSION% can be found via the
+    \l{http://bugreports.qt.nokia.com/}{Qt Bug Tracker}.
 
     For a list list of known bugs in Qt %VERSION%, see the \l{Task Tracker}
     on the Qt website.
 
     An overview of known issues may also be found at:
-    \l{http://qt.gitorious.org/qt/pages/Qt460BetaKnownIssues}
+    \l{http://qt.gitorious.org/qt/pages/Qt460KnownIssues}
     {Known Issues Wiki}.
 
     \section1 Installation Issues
@@ -134,6 +132,18 @@
         currently calls winId() on widgets, which causes whole widget hierarchies
         to use native window handles. This slows down resizing.
 
+    \o  Compile errors with Intel C++ Compiler.\br
+        There seems to be a bug in the Intel compiler with respect to
+        over-agressive inlining of code.
+        The problem will manifest itself during the link phase of QtGui where
+        it fails with the error that it cannot find QObjectData::~QObjectData().
+        See \l{http://bugreports.qt.nokia.com/browse/QTBUG-5145} for updates on this
+        bug.
+        Also, due to some bugs in WebKit, the QtScript and QtWebKit modules
+        will not compile.
+        See \l{http://bugreports.qt.nokia.com/browse/QTBUG-6297} for a
+        workaround for QtScript.
+        
     \endlist
 
     \section2 Mac OS X