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

Change-Id: I702087ea1a6b416da7f9011419de6a17ccfc00c3

4 files changed, 15 insertions, 2 deletions

diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index 95fb24a2..a6d886cc 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -41,6 +41,11 @@
 */
 
 /*!
+    \externalpage https://developer.apple.com/news/?id=12172013a
+    \title Xcode5Req
+*/
+
+/*!
     \externalpage http://opensource.org/licenses/bsd-license.php
     \title New and Modified BSD Licenses
 */
diff --git a/doc/src/platforms/ios.qdoc b/doc/src/platforms/ios.qdoc
index 969855b6..6479081b 100644
--- a/doc/src/platforms/ios.qdoc
+++ b/doc/src/platforms/ios.qdoc
@@ -62,8 +62,14 @@
     see \l{Qt Enterprise}{qt.digia.com} for details.
 
     Before installing Qt, you first need to install
-    Xcode. You will find it in the App Store \l{Xcode}{here}. For
-    running Qt applications in the simulator that comes with Xcode,
+    Xcode. You will find it in the Mac App Store \l{Xcode}{here}.
+
+    \note As \l{Xcode5Req}{required by Apple}, you should always use the latest
+    Xcode 5 version when building your applications for the App Store.
+    In practice this means you need OS X 10.8 or 10.9 to do iOS development
+    with Qt, as those are the only platforms where Xcode 5 will run.
+
+    For running Qt applications in the simulator that comes with Xcode,
     this is all you need. However, for running applications on a
     device and publishing your applications in the App Store, you must
     join the iOS Developer Program (see
diff --git a/doc/src/qmlapp/applicationdevelopers.qdoc b/doc/src/qmlapp/applicationdevelopers.qdoc
index 762136ac..929fb8de 100644
--- a/doc/src/qmlapp/applicationdevelopers.qdoc
+++ b/doc/src/qmlapp/applicationdevelopers.qdoc
@@ -87,6 +87,7 @@ version 2.7 and onwards.
 \li \l{qtquick-usecase-layouts.html}{Layouts in QML}
 \li \l{qtquick-usecase-styling.html}{Style and Theme Support}
 \li \l{qtquick-usecase-integratingjs.html}{Integrating JavaScript in QML}
+\li \l{Scalability}
 \endlist
 
 \section2 Buttons, Menus, and other Controls
diff --git a/doc/src/userinterfaces.qdoc b/doc/src/userinterfaces.qdoc
index 993ea083..5f0fc789 100644
--- a/doc/src/userinterfaces.qdoc
+++ b/doc/src/userinterfaces.qdoc
@@ -64,6 +64,7 @@ and shader effects.
 \li \l{qtquick-usecase-layouts.html}{Layouts in QML}
 \li \l{qtquick-usecase-styling.html}{Style and Theme Support}
 \li \l{qtquick-usecase-integratingjs.html}{Integrating JavaScript in QML}
+\li \l{Scalability}
 \endlist
 
 \section2 Graphical Controls