Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I5a0b75b970a94137dd3542978fea6b064ec87ed5

5 files changed, 13 insertions, 4 deletions

diff --git a/doc/src/getting-started/gettingstartedqt.qdoc b/doc/src/getting-started/gettingstartedqt.qdoc
index 07f75f5bb..67f957a10 100644
--- a/doc/src/getting-started/gettingstartedqt.qdoc
+++ b/doc/src/getting-started/gettingstartedqt.qdoc
@@ -62,13 +62,13 @@
     \image gs-project1.png "Qt Creator New File or Project dialog"
 
     To create the Notepad project, select \b File > \b{New File or Project} >
-    \b Applications > \b {Qt Gui Application} > \b Choose, and follow the
+    \b Applications > \b {Qt Widgets Application} > \b Choose, and follow the
     instructions of the wizard. In the \b {Class Information} dialog, type
     \b Notepad as the class name and select \b QMainWindow as the base class.
 
     \image gs-project2.png "Class Information Dialog"
 
-    The \b {Qt Gui Application} wizard creates a project that contains a main
+    The \b {Qt Widgets Application} wizard creates a project that contains a main
     source file and a set of files that specify a user interface (Notepad
     widget):
 
diff --git a/doc/src/images/gs-project1.png b/doc/src/images/gs-project1.png
index ccef3dd78..60f398a01 100644
--- a/doc/src/images/gs-project1.png
+++ b/doc/src/images/gs-project1.png
diff --git a/doc/src/platforms/ios.qdoc b/doc/src/platforms/ios.qdoc
index b6586b51a..818b156c5 100644
--- a/doc/src/platforms/ios.qdoc
+++ b/doc/src/platforms/ios.qdoc
@@ -90,7 +90,7 @@
     like so:
 
     \code
-        > ./configure -xplatform macx-ios-clang -developer-build -release
+        > ./configure -xplatform macx-ios-clang -release
     \endcode
 
     Then simply run \c{make}.
diff --git a/doc/src/platforms/platform-notes-android.qdoc b/doc/src/platforms/platform-notes-android.qdoc
index 011a1a2e6..13b5e22cb 100644
--- a/doc/src/platforms/platform-notes-android.qdoc
+++ b/doc/src/platforms/platform-notes-android.qdoc
@@ -134,6 +134,15 @@
     \note Embedding a QGLWidget inside a widget hierarchy is not supported. When QGLWidget is in use,
     it must be the top-level widget.
 
+    \section1 Multimedia Special Considerations
+
+    \l{Qt Multimedia}, like the rest of Qt, supports Android versions 2.3.3 (API level 10) or later.
+    There is however an exception for video output which requires Android versions 3.0 (API level 11)
+    or later. This affects camera preview and video player features.
+
+    Additionally, the \l{Qt Multimedia Widgets} module is not supported on Android, which means
+    video display is only available using the VideoOutput and \l{QtMultimedia::Video}{Video} QML items.
+
     \section1 Assets File System
 
     Qt for Android provides a special, virtual file system which is based on the \e assets mechanism
diff --git a/doc/src/whatsnew/whatsnew52.qdoc b/doc/src/whatsnew/whatsnew52.qdoc
index 1e97e70ee..5d403ad34 100644
--- a/doc/src/whatsnew/whatsnew52.qdoc
+++ b/doc/src/whatsnew/whatsnew52.qdoc
@@ -212,7 +212,7 @@
 
     \section1 List of API Changes
 
-    The pages below contain a list of API changes in Qt 5.1
+    The pages below contain a list of API changes in Qt 5.2
     \list
     \li \l{New Classes and Functions in Qt 5.2}
     \li \l{Obsolete Classes}