Merge remote-tracking branch 'origin/4.3'

Change-Id: I56004e3ec9dc9d92d33bdae438c4f7e069eccc45

4 files changed, 16 insertions, 11 deletions

diff --git a/doc/images/qtcreator-build-settings-ios.png b/doc/images/qtcreator-build-settings-ios.png
new file mode 100644
index 0000000000..eb14112004
--- /dev/null
+++ b/doc/images/qtcreator-build-settings-ios.png
diff --git a/doc/images/qtcreator-ios-add-kit.png b/doc/images/qtcreator-ios-add-kit.png
index fa3bee62b5..bbf7742769 100644
--- a/doc/images/qtcreator-ios-add-kit.png
+++ b/doc/images/qtcreator-ios-add-kit.png
diff --git a/doc/src/howto/creator-autotest.qdoc b/doc/src/howto/creator-autotest.qdoc
index b4cebaaac2..bdeb94cc87 100644
--- a/doc/src/howto/creator-autotest.qdoc
+++ b/doc/src/howto/creator-autotest.qdoc
@@ -49,7 +49,7 @@
 
     \list 1
         \li Select \uicontrol File > \uicontrol {New File or Project} >
-            \uicontrol {Other Project} > \uicontrol {Auto Test} >
+            \uicontrol {Other Project} > \uicontrol {Auto Test Project} >
             \uicontrol Choose to create a project with boilerplate code for a
             Qt test.
 
@@ -76,10 +76,9 @@
                     executed by the testing framework to initialize and clean
                     up the test.
 
-                \li In the \uicontrol {Build auto tests} field, select
-                    \uicontrol Always to always build the test when building
-                    the project or \uicontrol {Debug Only} to only build it
-                    during debug builds.
+                \li In the \uicontrol {Build system} field, select the build
+                    system to use for building the project: qmake, CMake, or
+                    Qbs.
 
             \endlist
 
@@ -95,7 +94,7 @@
 
     \list 1
         \li Select \uicontrol File > \uicontrol {New File or Project} >
-            \uicontrol {Other Project} > \uicontrol {Auto Test} >
+            \uicontrol {Other Project} > \uicontrol {Auto Test Project} >
             \uicontrol Choose to create a project with boilerplate code for a
             Google test.
 
@@ -116,11 +115,6 @@
                 \li Select the \uicontrol {Enable C++ 11} check box to
                     support C++ 11 features in the test.
 
-                \li In the \uicontrol {Build auto tests} field, select
-                    \uicontrol Always to always build the test when building
-                    the project or \uicontrol {Debug Only} to only build it
-                    during debug builds.
-
                 \li In the \uicontrol {Google test repository} field, select
                     a directory that contains a clone of the googletest
                     repository.
@@ -128,6 +122,10 @@
                     To use an installed Google C++ Testing framework instead,
                     see \l{Setting Up the Google C++ Testing Framework}.
 
+                \li In the \uicontrol {Build system} field, select the build
+                    system to use for building the project: qmake, CMake, or
+                    Qbs.
+
             \endlist
 
     \endlist
diff --git a/doc/src/ios/creator-ios-dev.qdoc b/doc/src/ios/creator-ios-dev.qdoc
index 06ff7f72a4..586406544a 100644
--- a/doc/src/ios/creator-ios-dev.qdoc
+++ b/doc/src/ios/creator-ios-dev.qdoc
@@ -89,6 +89,13 @@
 
                 \image qtcreator-ios-add-kit.png "Build & Run Settings"
 
+            \li In \uicontrol {iOS Settings}, select the development team to use
+                for signing and provisioning applications. You must configure
+                development teams and provisioning profiles in Xcode using an
+                Apple developer account.
+
+                \image qtcreator-build-settings-ios.png "iOS build settings"
+
         \endlist
 
         \li Select \uicontrol Run to specify run settings.