Merge remote-tracking branch 'origin/3.5'

Change-Id: I9baaf42531c10c32a2fa78d2504de213e77fdf82

9 files changed, 29 insertions, 59 deletions

diff --git a/doc/config/qtcreator-project.qdocconf b/doc/config/qtcreator-project.qdocconf
index 7b1976f0c6..e13fb032e3 100644
--- a/doc/config/qtcreator-project.qdocconf
+++ b/doc/config/qtcreator-project.qdocconf
@@ -29,7 +29,6 @@ indexes +=    $QDOC_INDEX_DIR/qtwidgets/qtwidgets.index \
               $QDOC_INDEX_DIR/qtsensors/qtsensors.index \
               $QDOC_INDEX_DIR/qttestlib/qttestlib.index \
               $QDOC_INDEX_DIR/qtuitools/qtuitools.index \
-              $QDOC_INDEX_DIR/qtwebkit/qtwebkit.index \
               $QDOC_INDEX_DIR/qtxml/qtxml.index
 
 include(macros.qdocconf)
diff --git a/doc/images/qtcreator-linux-device-configurations.png b/doc/images/qtcreator-linux-device-configurations.png
index 139123b67f..fc8398ef8c 100644
--- a/doc/images/qtcreator-linux-device-configurations.png
+++ b/doc/images/qtcreator-linux-device-configurations.png
diff --git a/doc/images/qtcreator-qnx-deployment.png b/doc/images/qtcreator-qnx-deployment.png
index 4e91687f34..459540ef66 100644
--- a/doc/images/qtcreator-qnx-deployment.png
+++ b/doc/images/qtcreator-qnx-deployment.png
diff --git a/doc/images/qtcreator-run-settings-linux-devices.png b/doc/images/qtcreator-run-settings-linux-devices.png
deleted file mode 100644
index 47be61e81a..0000000000
--- a/doc/images/qtcreator-run-settings-linux-devices.png
+++ /dev/null
diff --git a/doc/src/android/deploying-android.qdoc b/doc/src/android/deploying-android.qdoc
index 35e3beda58..2210ce950d 100644
--- a/doc/src/android/deploying-android.qdoc
+++ b/doc/src/android/deploying-android.qdoc
@@ -121,8 +121,8 @@
 
     \endlist
 
-    The Gradle wrappers and scripts are bundled only if you use Gradle, which is
-    the default. To use Ant instead, deselect the \uicontrol {Use Gradle} check box.
+    The Gradle wrappers and scripts are bundled only if you use
+    \l{Selecting the APK Build Tool}{Gradle} to build the application packages.
 
     To view the packages that the \c androiddeployqt tool created, select the
     \uicontrol {Open package location after build} check box.
diff --git a/doc/src/debugger/creator-debugger.qdoc b/doc/src/debugger/creator-debugger.qdoc
index c7598a3cf1..9fb1fb74e9 100644
--- a/doc/src/debugger/creator-debugger.qdoc
+++ b/doc/src/debugger/creator-debugger.qdoc
@@ -111,8 +111,7 @@
     parameters.
 
     \note Starting a C++ program in the debugger can take a long time, typically
-    in the range of several seconds to minutes if complex features (like
-    QtWebKit) are used.
+    in the range of several seconds to minutes if complex features are used.
 
 
     \section1 Launching the Debugger in Different Modes
@@ -217,7 +216,7 @@
     The \QC installation program asks you whether you want to register \QC as a
     post-mortem debugger. To change the setting, select
     \uicontrol Tools > \uicontrol Options > \uicontrol Debugger >
-    \uicontrol General > \uicontrol {Use QtCreator for post-mortem debugging}.
+    \uicontrol General > \uicontrol {Use Qt Creator for post-mortem debugging}.
 
     You can launch the debugger in the post-mortem mode if an application
     crashes on Windows. Click the \uicontrol {Debug in \QC} button in the error
diff --git a/doc/src/editors/creator-clang-codemodel.qdoc b/doc/src/editors/creator-clang-codemodel.qdoc
index 5effcc6458..fedc299804 100644
--- a/doc/src/editors/creator-clang-codemodel.qdoc
+++ b/doc/src/editors/creator-clang-codemodel.qdoc
@@ -96,35 +96,30 @@
 
     \list 1
 
-        \li To build the Clang code model plugin, you must acquire Clang and
-            LLVM in one of the following ways:
+        \li Acquire Clang 3.6.0 or higher in one of the following ways:
 
             \list
 
-                \li Build optimized versions of LLVM and Clang, as instructed in
-                    \l{http://clang.llvm.org/get_started.html}
-                    {Getting Started: Building and Running Clang}.
-
-                    The instructions describe how to build debug versions. To
-                    build optimized versions, enter the following command
-                    instead of just \c make:
+                \li Use the package manager of your system.
 
-                    \c{make ENABLE_OPTIMIZED=1}
+                \li Download and install LLVM from the
+                    \l{http://llvm.org/releases/}{LLVM Download Page} or
+                    \l{http://llvm.org/builds/}{LLVM Snapshot Builds}.
 
-                    For information about Git mirrors, see
-                    \l{http://llvm.org/docs/GettingStarted.html#git-mirror}
-                    {Git Mirror}.
+                \li Build Clang by following
+                    \l{http://clang.llvm.org/get_started.html}
+                    {Getting Started: Building and Running Clang}.
 
-                    Install the built versions by entering the following
-                    command:
+                    Add the following options to the \c cmake call in order to
+                    build an optimized version and to specify the installation
+                    directory:
 
-                    \c{make install}
+                        \c -DCMAKE_BUILD_TYPE=Release
+                        \c -DCMAKE_INSTALL_PREFIX=/your/install/dir
 
-                \li Download and install LLVM from the
-                    \l{http://llvm.org/releases/}{LLVM Download Page} or
-                    \l{http://llvm.org/builds/}{LLVM Snapshot Builds}.
+                    After building, install with
 
-                \li Use the package manager of your system.
+                        \c {make install}
 
             \endlist
 
@@ -132,26 +127,7 @@
             of LLVM either as part of the build environment or pass it directly
             to qmake when you build \QC.
 
-            The following are examples of the LLVM_INSTALL_DIR values to use
-            depending on the installation method:
-
-            \list
-
-                \li Installed via package manager on Linux:
-
-                    \c {LLVM_INSTALL_DIR=/usr/lib/llvm-3.6}
-
-                \li Manually built on Unix in release mode:
-
-                    \c {LLVM_INSTALL_DIR=$HOME/llvm-build/Release+Asserts}
-
-                \li Installed from a snapshot on Windows:
-
-                    \c {LLVM_INSTALL_DIR=C:\llvm}
-
-            \endlist
-
-    \li Rebuild \QC.
+    \li Rerun \c qmake and build \QC.
 
     \endlist
 
diff --git a/doc/src/editors/creator-editors.qdoc b/doc/src/editors/creator-editors.qdoc
index 1ee685c844..5c8fcb6a53 100644
--- a/doc/src/editors/creator-editors.qdoc
+++ b/doc/src/editors/creator-editors.qdoc
@@ -177,14 +177,13 @@
     \QC validates instances of JSON entities against
     \l{http://tools.ietf.org/html/draft-zyp-json-schema-03}
     {A JSON Media Type for Describing the Structure and Meaning of JSON Documents}.
-    However, this feature is still under development, and \QC does not yet
-    understand the entire specification.
+    However, \QC does not understand the entire specification.
 
     A JSON schema defines the structure of JSON data. It determines what JSON
     data is required for an application and how to interact with it.
 
     The specification does not define how to map JSON instances with JSON
-    schemas. As a temporary solution, \QC looks for a JSON schema file with a
+    schemas. \QC looks for a JSON schema file with a
     name that matches the name of the JSON instance file in the user
     configuration folder. For example, \c {~/config/QtProject/qtcreator/json} on
     Linux and OS X and
@@ -203,8 +202,7 @@
     \section1 List of JavaScript and QML Checks
 
     Many of the JavaScript checks are similar to the ones in Douglas Crockford's
-    JSLint tool and are explained well on
-    \l{http://www.jslint.com/lint.html}{the JSLint website}.
+    \l{http://www.jslint.com}{JSLint} tool.
 
     \table
     \header
@@ -1053,13 +1051,14 @@
     For example, you might ask colleagues to review a change that you plan to
     submit to a version control system. If you use the Git version control
     system, you can create a \e{diff} view by selecting \uicontrol Tools >
-    \uicontrol Git > \uicontrol {Diff Repository}. You can then upload its
-    contents to the server by choosing \uicontrol Tools >
+    \uicontrol Git > \uicontrol {Local Repository} > \uicontrol Diff. You can
+    then upload its contents to the server by selecting \uicontrol Tools >
     \uicontrol {Code Pasting} > \uicontrol {Paste Snippet}. The reviewers can
     retrieve the code snippet by selecting \uicontrol Tools >
     \uicontrol {Code Pasting} > \uicontrol {Fetch Snippet}. If they have the
     project currently opened in \QC, they can apply and test the change by
-    choosing \uicontrol Tools > \uicontrol Git > \uicontrol {Apply Patch}.
+    choosing \uicontrol Tools > \uicontrol Git > \uicontrol {Patch} >
+    \uicontrol {Apply from Editor}.
 
 */
 
diff --git a/doc/src/linux-mobile/linuxdev.qdoc b/doc/src/linux-mobile/linuxdev.qdoc
index be23dc6aa5..b4ded6b3d1 100644
--- a/doc/src/linux-mobile/linuxdev.qdoc
+++ b/doc/src/linux-mobile/linuxdev.qdoc
@@ -117,11 +117,8 @@
 
         \endlist
 
-        \li Select \uicontrol Run to specify run settings.
-
-                \image qtcreator-run-settings-linux-devices.png "Run settings for embedded Linux devices"
-
-            Usually, you can use the default settings.
+        \li Select \uicontrol Run to specify run settings. Usually, you can use
+            the default settings.
 
     When you run the project, \QC deploys the application as specified by the
     deploy steps. By default, \QC copies the application files to the device.