Merge branch '4.8'

Conflicts:
	doc/src/declarative/whatsnew.qdoc
	doc/src/examples/orientation.qdoc
	doc/src/examples/webftpclient.qdoc
	examples/declarative/ui-components/main/qml/pics/niagara_falls.jpg
	src/corelib/global/qglobal.cpp
	src/gui/text/qglyphs.cpp
	src/gui/text/qplatformfontdatabase_qpa.cpp

2 files changed, 12 insertions, 25 deletions

diff --git a/doc/src/platforms/emb-install.qdoc b/doc/src/platforms/emb-install.qdoc
index 88bbae0..32a0848 100644
--- a/doc/src/platforms/emb-install.qdoc
+++ b/doc/src/platforms/emb-install.qdoc
@@ -74,6 +74,9 @@
 
     \snippet doc/src/snippets/code/doc_src_emb-install.qdoc embedded help
 
+    The \l{Configuration Options for Qt} page gives a brief overview
+    of these.
+
     Note that by default, \l{Qt for Embedded Linux} is configured for
     installation in the \c{/usr/local/Trolltech/QtEmbedded-%VERSION%}
     directory, but this can be changed by using the \c{-prefix}
diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc
index 113ad86..24b297f 100644
--- a/doc/src/platforms/platform-notes.qdoc
+++ b/doc/src/platforms/platform-notes.qdoc
@@ -630,7 +630,7 @@
     we need to do special bookkeeping in Qt to handle this correctly, which
     unfortunately make mixing in native panels hard. The best way at the moment
     to do this, is to follow the pattern below, where we post the call to the
-    function with native code rather than calling it directly. Then we now that
+    function with native code rather than calling it directly. Then we know that
     Qt has cleanly updated any pending event loop recursions before the native 
     panel is shown:
 
@@ -708,28 +708,8 @@
 
     \section1 Supported Devices
 
-    Qt is designed to work on any device which runs one of the following
-    versions of Symbian:
-
-    \table
-    \header \o Symbian Version
-    \row \o S60 3.1
-    \row \o S60 3.2
-    \row \o S60 5.0 (Symbian ^1)
-    \endtable
-
-    Qt has received \l{Tier 1 Platforms}{Tier 1} testing on the following phone models:
-
-    \table
-    \header \o Phone
-    \row    \o Nokia 5800
-    \row    \o Nokia E71
-    \row    \o Nokia E72
-    \row    \o Nokia N78
-    \row    \o Nokia N95
-    \row    \o Nokia N97
-    \row    \o Samsung i8910
-    \endtable
+    See the list of supported devices at
+    http://wiki.forum.nokia.com/index.php/Nokia_Smart_Installer_for_Symbian#Supported_Devices
 
     \section1 Supported Functionality
 
@@ -742,8 +722,6 @@
             \o Planned for future release.
     \row    \o QtDBus
             \o No current plans to support this feature.
-    \row    \o QtOpenGL ES
-            \o Planned for future release.
     \row    \o Printing support
             \o No current plans to support this feature.
     \row    \o Qt3Support
@@ -837,6 +815,12 @@
     plugin. If the Helix plugin fails to load, the MMF plugin, if present on
     the device, will be loaded instead.
 
+    \section1 QtOpenGL Support
+
+    Qt 4.7 introduces the QtOpenGL module to Symbian^3. QtOpenGL is supported on
+    devices which support OpenGL ES 2.0. Symbian platforms prior to Symbian^3
+    are not supported.
+
     \section1 UI Performance in devices prior to Symbian^3
 
     Qt uses the QPainter class to perform low-level painting on widgets and