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

Change-Id: I5c9ab2d11657989754f470fd9e1f2aa43f56d7ea

4 files changed, 18 insertions, 10 deletions

diff --git a/doc/src/datastorage.qdoc b/doc/src/datastorage.qdoc
index 2906a4db..d887af1b 100644
--- a/doc/src/datastorage.qdoc
+++ b/doc/src/datastorage.qdoc
@@ -236,7 +236,7 @@ The QSettings class provides persistent storage of application settings.
 An application usually remembers its settings from the previous session.
 
 Settings are stored differently on different platforms. For example,
-on Windows they are stored in the registry, whereas, on MAC OS X they are
+on Windows they are stored in the registry, whereas, on OS X they are
 stored in XML files.
 
 QSettings enable you to save and restore application settings in a portable
diff --git a/doc/src/development/cmake-manual.qdoc b/doc/src/development/cmake-manual.qdoc
index 08e482e0..f2d69509 100644
--- a/doc/src/development/cmake-manual.qdoc
+++ b/doc/src/development/cmake-manual.qdoc
@@ -143,10 +143,12 @@
     \c{find_package}(Qt5Widgets) will make the following variables available if successfully found:
 
     \list
-    \li Qt5Widgets_VERSION_STRING
-    \li Qt5Widgets_LIBRARIES List of libraries for use with the target_link_libraries command, for example.
-    \li Qt5Widgets_INCLUDE_DIRS List of libraries for use with the include_directories command, for example.
-    \li Qt5Widgets_DEFINITIONS List of definitions for use with add_definitions, for example.
+    \li Qt5Widgets_VERSION String describing the version of the module.
+    \li Qt5Widgets_VERSION_STRING Same as Qt5Widgets_VERSION.
+        Deprecated, use Qt5Widgets_VERSION instead.
+    \li Qt5Widgets_LIBRARIES List of libraries for use with the target_link_libraries command.
+    \li Qt5Widgets_INCLUDE_DIRS List of directories for use with the include_directories command.
+    \li Qt5Widgets_DEFINITIONS List of definitions for use with add_definitions.
     \li Qt5Widgets_COMPILE_DEFINITIONS List of definitions for use with the COMPILE_DEFINITIONS target property.
     \li Qt5Widgets_FOUND Boolean describing whether the module was found successfully.
     \li Qt5Widgets_EXECUTABLE_COMPILE_FLAGS String of flags to be used when building executables.
diff --git a/doc/src/development/uic.qdoc b/doc/src/development/uic.qdoc
index a0eaafd7..e3e5772b 100644
--- a/doc/src/development/uic.qdoc
+++ b/doc/src/development/uic.qdoc
@@ -53,6 +53,11 @@
     \row \li \c{-p} \li Don't generate guards against multiple inclusion (\c #ifndef FOO_H ...).
     \row \li \c{-h} \li Display the usage and the list of options.
     \row \li \c{-v} \li Display \c{uic}'s version number.
+    \row \li \c{-d} \li Display the dependencies for the UI.
+    \row \li \c{-n} \li Don't generate any #include directives.
+    \row \li \c{--postfix <postfix>} \li Append \c <postfix> to all generated classnames.
+    \row \li \c{--include <file>} \li Add #include \c <file> to the output.
+
     \endtable
 
     \section1 Examples
diff --git a/doc/src/platforms/ios.qdoc b/doc/src/platforms/ios.qdoc
index c8986e27..4cbcc431 100644
--- a/doc/src/platforms/ios.qdoc
+++ b/doc/src/platforms/ios.qdoc
@@ -61,9 +61,9 @@
     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.
+    Xcode version when building your applications for the App Store.
+    In practice this means you also need the latest version of OS X to develop
+    iOS apps with Qt, due to Xcode's system requirements.
 
     For running Qt applications in the simulator that comes with Xcode,
     this is all you need. However, for running applications on a
@@ -545,12 +545,13 @@
     like the following code snippet to the .pro file:
     \badcode
     ios {
-        launch_images.files = $$PWD/ios/Launch.xib $$files($$PWD/ios/LaunchImage*.png)
-        QMAKE_BUNDLE_DATA += launch_images
+        app_launch_images.files = $$PWD/ios/Launch.xib $$files($$PWD/ios/LaunchImage*.png)
+        QMAKE_BUNDLE_DATA += app_launch_images
     }
     \endcode
 
     This allows you to produce universal applications with valid LaunchImages as required by the Apple App Store.
+    \important \c "launch_images" is used internally by Qt, so it will be overwritten if used in your .pro file.
 
     \section1 Publishing to Apple App Store