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

5 files changed, 55 insertions, 28 deletions

diff --git a/doc/src/getting-started/known-issues.qdoc b/doc/src/getting-started/known-issues.qdoc
index 0fa23f6..0c2d8d8 100644
--- a/doc/src/getting-started/known-issues.qdoc
+++ b/doc/src/getting-started/known-issues.qdoc
@@ -63,10 +63,6 @@
 
     \list
 
-    \o Performing a new install of the Qt 4.6 beta on Snow Leopard
-       triggers a bug in the installer that causes the install to fail.
-       Updating an existing Qt installation works fine.
-
     \o There are two workarounds, either disable spotlight for the target
        drive during the install, or do a custom install where you deselect
        documentation and examples. Run the installer again as a full
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index e45892f..77856ec 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -99,7 +99,7 @@
                   <li><a href="linguist-manual.html">Qt Linguist</a></li>
                   <li><a href="assistant-manual.html">Qt Assistant</a></li>
                   <li><a href="qmake-manual.html">Qt qmake</a></li>
-                  <li><a href="http://doc.qt.nokia.com/qtsimulator-1.0/simulator-description.html">Qt Simulator</a></li>
+                  <li><a href="http://doc.qt.nokia.com/qtsimulator-1.0/index.html">Qt Simulator</a></li>
                   <li><a href="http://qt.nokia.com/developer/eclipse-integration">Eclipse Integration</a></li>
                   <li><a href="http://qt.nokia.com/products/appdev">Add-On Products and Services</a></li>
                   <li><a href="qvfb.html">Virtual Framebuffer</a></li>
diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc
index e7133e3..db6ff7c 100644
--- a/doc/src/legal/3rdparty.qdoc
+++ b/doc/src/legal/3rdparty.qdoc
@@ -683,4 +683,36 @@
     THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
     OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+	
+    \hr
+
+	jquery 1.4.2.js Copyright 2010 John Resig
+	This software is dual licensed under the MIT or GPL version 2 licenses.
+	Nokia has used the software herein under the MIT license.
+
+	jquery includes Sizzle.js Copyright 2010 The Dojo Foundaton and is
+	licensed under the MIT, BSD and GPL licenses.  Nokia has used this
+	software herein under the MIT license.
+
+	The MIT License
+
+	Permission is hereby granted, free of charge, to any person obtaining a copy
+	of this software and associated documentation files (the "Software"), to deal
+	in the Software without restriction, including without limitation the rights
+	to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+	copies of the Software, and to permit persons to whom the Software is
+	furnished to do so, subject to the following conditions:
+
+	The above copyright notice and this permission notice shall be included in
+	all copies or substantial portions of the Software.
+
+	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+	THE SOFTWARE.
+	
+	
 */
diff --git a/doc/src/platforms/compiler-notes.qdoc b/doc/src/platforms/compiler-notes.qdoc
index c6ecd68..3870e8f 100644
--- a/doc/src/platforms/compiler-notes.qdoc
+++ b/doc/src/platforms/compiler-notes.qdoc
@@ -68,7 +68,7 @@
     \endtable
 
     * WebKit is only supported as a dynamically built library. Static linkage is not supported.
-
+    
     \target GCC
     \section1 GCC
 
@@ -115,6 +115,7 @@
     \section2 Solaris
 
     Please use GCC 3.4.2 or later.
+	Please not that WebKit is not supported for Solaris, regardless of which compiler is used.
 
     \section2 Mac OS X
 
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index bb80ae5..6e9fb3d 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -64,18 +64,22 @@
     \row    \o Linux (32 and 64-bit)
                                      \o gcc 4.2
     \row    \o Microsoft Windows XP
-                                     \o gcc 4.4 (MinGW) (32-bit), MSVC 2003, 2005 (32 and 64-bit)
+                                     \o gcc 4.4 (MinGW) (32-bit), MSVC 2005 (32 and 64-bit)
     \row    \o Microsoft Windows Vista
                                      \o MSVC 2005, 2008
     \row    \o Microsoft Windows Vista 64bit
                                      \o MSVC 2008
-    \row    \o Apple Mac OS X 10.5 "Leopard" x86_64 (Carbon, Cocoa 32 and 64bit)
+    \row    \o Microsoft Windows 7
+                                     \o MSVC 2008
+    \row    \o Apple Mac OS X 10.6 "Snow Leopard" 
+                                     \o As provided by Apple
+    \row    \o Apple Mac OS X 10.5 "Leopard" x86_64 (Cocoa 32 and 64bit)
                                      \o As provided by Apple
     \row    \o Embedded Linux QWS (ARM)
                                      \o gcc (\l{http://www.codesourcery.com/}{Codesourcery version)}
     \row    \o Windows CE 5.0 (ARMv4i, x86, MIPS)
                                      \o MSVC 2005 WinCE 5.0 Standard (x86, pocket, smart, mipsii)
-    \row    \o Symbian (Symbian/S60 3.1, 3.2 and 5.0)
+    \row    \o Symbian (Symbian/S60 5.0)
                                      \o RVCT 2.2 [build 686 or later], WINSCW 3.2.5 [build 482 or later], GCCE (for applications)
     \endtable
 
@@ -90,19 +94,15 @@
     \table
     \header \o Platform
                                      \o Compilers
-    \row    \o Windows XP, Vista
-                                     \o gcc 3.4.2 (MinGW)
     \row    \o Windows 7
-                                     \o MSVC 2008
-    \row    \o Apple Mac OS X 10.6 "Snow Leopard"
+                                     \o MSVC 2010
+    \row    \o Apple Mac OS X 10.4 "Tiger" (Carbon)
                                      \o As provided by Apple
-    \row    \o Apple Mac OS X 10.4 "Tiger"
+    \row    \o Apple Mac OS X 10.5 "Leopard" (Carbon)
                                      \o As provided by Apple
-    \row    \o HPUXi 11.11
-                                     \o aCC 3.57, gcc 3.4
     \row    \o HPUXi 11.23
                                      \o aCC 6.10
-    \row    \o Solaris 10 (UltraSparc, x86)
+    \row    \o Solaris 10 UltraSparc
                                      \o Sun Studio 12
     \row    \o AIX 6
                                      \o Power5 xlC 7
@@ -114,8 +114,14 @@
                                      \o gcc (\l{http://www.codesourcery.com/}{Codesourcery version)}
     \row    \o Embedded Linux X11 (ARM)
                                      \o gcc (\l{http://www.scratchbox.org/}{Scratchbox)}
+    \row    \o Windows CE 5.0 (ARMv4i, x86, MIPS)
+                                     \o MSVC 2005 WinCE 5.0 Standard (x86, pocket, smart, mipsii)
     \row    \o Windows CE 6.0 (ARMv4i, x86, MIPS)
                                      \o MSVC 2008 WinCE 6.0 Professional
+    \row    \o Maemo 5(Linux, ARM, X11)
+                                     \o gcc (\l{http://www.scratchbox.org/}{Scratchbox)}
+    \row    \o Symbian (Symbian/S60 3.1, 3.2)
+                                     \o RVCT 2.2 [build 686 or later], WINSCW 3.2.5 [build 482 or later], GCCE (for applications)
     \endtable
 
     \section1 Tier 3 Platforms (Not supported by Nokia)
@@ -142,20 +148,12 @@
     implied warranties of merchantability, fitness for a particular purpose, title and
     non-infringement with regard to the Licensed Software.
     
-    \section1 Planned Changes for Qt 4.7
+    \section1 Planned Changes for Qt 4.8
 
     The following changes to the list of supported platforms are at time of publishing
-    planned for Qt 4.7:
+    planned for Qt 4.8:
 
     \list
-    \o Upgrade Windows 7 to Tier 1
-    \o Upgrade Mac OS X 10.6 to Tier 1
-    \o Add support for Visual Studio 2010 (Tier 2)
-    \o Move support for Carbon implementation of Qt on Mac OS X from Tier 1 to Tier 2
-    \o Drop support for MinGW 3.4
-    \o Drop support for Visual Studio 2003
-    \o Drop support for HP-UX on PA-RISC
-    \o Drop support for Windows Mobile 5
-    \o Drop support for OpenGL ES Common Lite 1.0
+    \o Plans not yet released
     \endlist
 */