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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Mac: restoreGeometry()
  [Regression] Build failure on Mac Carbon
  doc: Added some \briefs to how-to docs.
  Some 4.7 changes.
  Updated changelog.
  Cherry pick fix for MOBILITY-932 from Qt Mobility.
  Cherry pick fix for MOBILITY-962 from Qt Mobility.
  Cherry pick fix for MOBILITY-828 from Qt Mobility.
  Bearer management changes from Qt Mobility.
  Cherry pick fix for MOBILITY-828 from Qt Mobility.
  Added snippet labels to QML Dial example.
  Fixed documentation typo.

12 files changed, 29 insertions, 20 deletions

diff --git a/doc/src/frameworks-technologies/dbus-adaptors.qdoc b/doc/src/frameworks-technologies/dbus-adaptors.qdoc
index 11c5998be6..25c6a43dbe 100644
--- a/doc/src/frameworks-technologies/dbus-adaptors.qdoc
+++ b/doc/src/frameworks-technologies/dbus-adaptors.qdoc
@@ -43,6 +43,7 @@
     \page usingadaptors.html
     \title Using QtDBus Adaptors
     \ingroup technology-apis
+    \brief How to create and use DBus adaptors in Qt.
 
     \ingroup best-practices
 
diff --git a/doc/src/howtos/HWacceleration.qdoc b/doc/src/howtos/HWacceleration.qdoc
index fbc657cd27..c7b1a72081 100644
--- a/doc/src/howtos/HWacceleration.qdoc
+++ b/doc/src/howtos/HWacceleration.qdoc
@@ -41,17 +41,20 @@
 
 /*!
     \page HWAcc_rendering.html
-    \title Using hardware acceleration on embedded platforms.
+    \title Hardware Acceleration &amp Embedded Platforms.
+    \brief How to use hardware acceleration for fast rendering.
 
     \ingroup best-practices
 
     \section1 Abstract
+
     This document describes how to use hardware acceleration for fast
-    rendering on embedded platforms supported by Qt. In short, it explains
-    how the graphics pipeline works. Since there might be differences to 
-	how the APIs are being used on different embedded platforms, a table
-	links to documentation dedicated to platform specific documentation
-	for each supported hardware acceleration API.
+    rendering on embedded platforms supported by Qt. In short, it
+    explains how the graphics pipeline works. Since there might be
+    differences to how the APIs are being used on different embedded
+    platforms, a table links to documentation dedicated to platform
+    specific documentation for each supported hardware acceleration
+    API.
 
     \input platforms/emb-hardwareacceleration.qdocinc
 
diff --git a/doc/src/howtos/accelerators.qdoc b/doc/src/howtos/accelerators.qdoc
index 65f1defc59..b6ef5c2a6d 100644
--- a/doc/src/howtos/accelerators.qdoc
+++ b/doc/src/howtos/accelerators.qdoc
@@ -42,6 +42,7 @@
 /*!
     \page accelerators.html
     \title Standard Accelerator Keys
+    \brief Recommended accelerator keys.
 
     \ingroup best-practices
 
diff --git a/doc/src/howtos/appicon.qdoc b/doc/src/howtos/appicon.qdoc
index dd39509a25..9377961257 100644
--- a/doc/src/howtos/appicon.qdoc
+++ b/doc/src/howtos/appicon.qdoc
@@ -42,6 +42,7 @@
 /*!
     \page appicon.html
     \title Setting the Application Icon
+    \brief How to set your application's icon.
 
     \ingroup best-practices
 
diff --git a/doc/src/howtos/guibooks.qdoc b/doc/src/howtos/guibooks.qdoc
index 1a706704f5..bccfbe6ff3 100644
--- a/doc/src/howtos/guibooks.qdoc
+++ b/doc/src/howtos/guibooks.qdoc
@@ -43,6 +43,7 @@
     \page guibooks.html
     \title Books about GUI Design
     \ingroup best-practices
+    \brief Some recommended books about GUI design.
 
     This is not a comprehensive list -- there are many other books worth
     buying. Here we mention just a few user interface books that don't
diff --git a/doc/src/howtos/qtdesigner.qdoc b/doc/src/howtos/qtdesigner.qdoc
index 2dd7fcfe67..92041f0a74 100644
--- a/doc/src/howtos/qtdesigner.qdoc
+++ b/doc/src/howtos/qtdesigner.qdoc
@@ -42,6 +42,7 @@
 /*!
     \page qtdesigner-components.html
     \title Creating and Using Components for Qt Designer
+    \brief How to create and use custom widget plugins.
     \ingroup best-practices
 
     \tableofcontents
diff --git a/doc/src/howtos/restoring-geometry.qdoc b/doc/src/howtos/restoring-geometry.qdoc
index 36c5e4f4e4..e72b99320c 100644
--- a/doc/src/howtos/restoring-geometry.qdoc
+++ b/doc/src/howtos/restoring-geometry.qdoc
@@ -42,7 +42,7 @@
 /*!
     \page restoring-geometry.html
     \title Restoring a Window's Geometry
-
+    \brief How to save &amp restore window geometry.
     \ingroup best-practices
 
     This document describes how to save and restore a \l{Window
diff --git a/doc/src/howtos/session.qdoc b/doc/src/howtos/session.qdoc
index e2e87a89dc..f53af0433d 100644
--- a/doc/src/howtos/session.qdoc
+++ b/doc/src/howtos/session.qdoc
@@ -42,7 +42,7 @@
 /*!
     \page session.html
     \title Session Management
-
+    \brief How to do session management with Qt.
     \ingroup best-practices
 
     A \e session is a group of running applications, each of which has a
diff --git a/doc/src/howtos/sharedlibrary.qdoc b/doc/src/howtos/sharedlibrary.qdoc
index 70fc4db562..ed803ed7cb 100644
--- a/doc/src/howtos/sharedlibrary.qdoc
+++ b/doc/src/howtos/sharedlibrary.qdoc
@@ -42,7 +42,7 @@
 /*!
     \page sharedlibrary.html
     \title Creating Shared Libraries
-
+    \brief How to create shared libraries.
     \ingroup best-practices
 
     The following sections list certain things that should be taken into
diff --git a/doc/src/howtos/timers.qdoc b/doc/src/howtos/timers.qdoc
index cfc2fb4abd..b0019167eb 100644
--- a/doc/src/howtos/timers.qdoc
+++ b/doc/src/howtos/timers.qdoc
@@ -42,7 +42,7 @@
 /*!
     \page timers.html
     \title Timers
-    \brief How to use timers in your application.
+    \brief How to use Qt timers in your application.
 
     \ingroup best-practices
 
diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc
index 8f5b6a558f..16e0c0ff77 100644
--- a/doc/src/platforms/platform-notes.qdoc
+++ b/doc/src/platforms/platform-notes.qdoc
@@ -517,7 +517,7 @@
 
     Note that some modules rely on other modules. If your application uses
     QtXmlPatterns, QtWebkit or QtScript it may still require \c NetworkServices
-    \o as these modules rely on QtNetwork to go online.
+    as these modules rely on QtNetwork to go online.
 
     For more information see the documentation of the individual Qt classes. If
     a class does not mention Symbian capabilities, it requires none.
diff --git a/doc/src/sql-programming/qsqldatatype-table.qdoc b/doc/src/sql-programming/qsqldatatype-table.qdoc
index fc961f5351..398e659a9a 100644
--- a/doc/src/sql-programming/qsqldatatype-table.qdoc
+++ b/doc/src/sql-programming/qsqldatatype-table.qdoc
@@ -41,19 +41,20 @@
 
 /*!
   \page sql-types.html
-  \title Recommended Use of Data Types in Databases
+  \title Data Types for Qt-supported Database Systems
+  \brief Recommended data types for database systems
   
   \ingroup best-practices
 
-  \section1 Recommended Use of Types in Qt Supported Databases
+  \section1 Data Types for Qt Supported Database Systems
 
-  This table shows the recommended data types used when extracting data 
-  from the databases supported in Qt. It is important to note that the
-  types used in Qt are not necessarily valid as input to the specific
-  database. One example could be that a double would work perfectly as
-  input for floating point records in a database, but not necessarily
-  as a storage format for output from the database since it would be stored
-  with 64-bit precision in C++.
+  This table shows the recommended data types for extracting data from
+  the databases supported in Qt. Note that types used in Qt are not
+  necessarily valid as input types to a specific database
+  system. e.g., A double might work perfectly as input for floating
+  point records in a particular database, but not necessarily as a
+  storage format for output from that database, because it would be
+  stored with 64-bit precision in C++.
 
   \tableofcontents