Merge remote-tracking branch 'origin/3.5'

Change-Id: I7b3ef276d438ff0f184a649153e8aeec08a9f8c9

doc/src/analyze/creator-clang-static-analyzer.qdoc

@@ -44,7 +44,9 @@
     \l{http://clang-analyzer.llvm.org/available_checks.html}{Available Checkers}.
 
     To suppress diagnostics, select \uicontrol {Suppress This Diagnostic} in the
-    context menu.
+    context menu. To view the suppression list for a project and to remove
+    diagnostics from it, select \uicontrol {Clang Static Analyzer Settings} in
+    the \uicontrol Projects mode.
 
     \section1 Setting Up Clang Static Analyzer
 

doc/src/android/androiddev.qdoc

@@ -67,6 +67,8 @@
             \l{http://developer.android.com/tools/sdk/ndk/index.html}
             {Android NDK} from Google.
 
+            \note Android Studio is currently not supported by \QC.
+
         \li On Windows, you also need the following:
 
           \list

doc/src/android/deploying-android.qdoc

@@ -291,6 +291,7 @@
     \li In the \uicontrol Application group, you can give the application a name and
     select an icon for it. The three icon fields can contain different versions
     of the icon with low, medium, and high DPI values, from left to right.
+    You can also give an activity a name and select the activity to run.
 
     \li In the \uicontrol Permissions field, you can specify the permissions that your
     application needs. Users are asked to grant the permissions when they

doc/src/howto/creator-sessions.qdoc

@@ -55,20 +55,22 @@
     developers working on the same projects.
 
     For example, if you work on a project and need to switch to another project
-    for a while, you can save your workspace as a session and then close the
-    project and all the files in it. Everything that you open after saving the
-    session becomes a part of a new session. When you want to return to working
-    on the first project, open the saved session. \QC opens the projects and
-    files that belong to the session.
+    for a while, you can clone the current session to save it under a name and
+    create a new session for the other project. Everything that you open after
+    switching to the new session becomes a part of it. When you want to return
+    to working on the first project, switch to the saved session. \QC opens the
+    projects and files that belong to the session.
 
-    To create a new session or remove existing sessions, select \uicontrol File >
-    \uicontrol{Session Manager}.
+    To save a session under a new name, select \uicontrol File >
+    \uicontrol {Session Manager} > \uicontrol Clone.
+
+    To create a new session, select \uicontrol File >
+    \uicontrol {Session Manager} > \uicontrol New.
 
     \image qtcreator-session-manager.png
 
-    To switch between sessions, choose \uicontrol {File > Session Manager}. If you do
-    not create or select a session, \QC always uses the default session, which
-    was created the last time you exited \QC.
+    To switch between sessions, choose \uicontrol {File > Session Manager} >
+    \uicontrol {Switch to}.
 
     When you launch \QC, a list of existing sessions is displayed in the
     \uicontrol Welcome mode.

doc/src/howto/creator-ui.qdoc

@@ -486,6 +486,11 @@
     To determine whether the keywords in the whole project or in the current
     file are displayed by default, select \uicontrol {Scanning scope}.
 
+    To exclude files from scanning, select \uicontrol {To-Do Settings} in the
+    \uicontrol Projects mode. Select \uicontrol Add and enter a regular
+    expression that matches the path to files to exclude. Use a forward slash
+    (/) as a separator in the path also on Windows.
+
     The Todo plugin is disabled by default. To enable the plugin, select
     \uicontrol Help > \uicontrol {About Plugins} > \uicontrol Utilities >
     \uicontrol Todo and restart

doc/src/howto/creator-vcs.qdoc

@@ -722,6 +722,12 @@
     deselect the \uicontrol Load check box for the \uicontrol Perforce plugin in the
     \uicontrol {Version Control} group.
 
+    In the Perforce options, you can specify workspace details:
+    \uicontrol {P4 user}, \uicontrol {P4 client}, and \uicontrol {P4 port}. To
+    specify the details individually for several projects, use configuration
+    files instead. Create a \c {p4config.txt} configuration file for each
+    project in the top level project directory.
+
     The \uicontrol Perforce submenu contains the following additional items:
 
     \table

doc/src/projects/creator-projects-cmake.qdoc

@@ -39,13 +39,20 @@
     Since \QC 1.1, CMake configuration files are supported. Since \QC 1.3, the
     Microsoft tool chain is supported if the CMake version is at least 2.8.
 
-    \section1 Setting the Path for CMake
+    \QC automatically detects the CMake executable specified in the \c PATH.
+    You can add paths to other CMake executables and use them in different
+    build and run \l{glossary-buildandrun-kit}{kits}.
 
-    You can set the path for the CMake executable in \uicontrol Tools >
-    \uicontrol Options > \uicontrol {Build & Run} > \uicontrol CMake.
+    \section1 Adding CMake Tools
+
+    To specify paths to CMake executables, select \uicontrol Tools >
+    \uicontrol Options > \uicontrol {Build & Run} > \uicontrol CMake >
+    \uicontrol Add.
 
     \image qtcreator-cmakeexecutable.png
 
+    \section1 Opening CMake Projects
+
     \note Before you open a CMake project, you must modify the \c {PATH}
     environment variable to include the bin folders of \c mingw and Qt.
 
@@ -60,8 +67,6 @@
     C:\Qt\Tools\QtCreator\qtcreator.exe
     \endcode
 
-    \section1 Opening CMake Projects
-
     To open a CMake project:
 
     \list 1
@@ -103,6 +108,9 @@
     \QC supports multiple build configurations. You can change the build
     directory after the initial import.
 
+    The build and run kit that you select determines which CMake tool is used
+    for building. For more information, see \l {Adding Kits}.
+
     \section1 Running CMake Projects
 
     \QC automatically adds \uicontrol {Run Configurations} for all targets

doc/src/projects/creator-projects-qbs.qdoc

@@ -155,8 +155,8 @@
 
     \image qtcreator-options-qbs.png
 
-    To add keys and values to a build profile that is associated with a build
-    and run kit:
+    You can modify a build profile that is associated with a build and run kit
+    by editing the values of the keys generated by \QC and by adding new values:
 
     \list 1
 
@@ -166,12 +166,21 @@
 
         \li Select \uicontrol Edit to edit the profile associated with the kit.
 
-        \li Select \uicontrol Add to add keys and values to the profile.
-            Spefify keys as: \c <module_name>.<property_name>. Specify the
-            values as JSON literals.
+        \li Select \uicontrol Add to add keys and values to the profile or to
+            modify existing values.
+
+        \li In the \uicontrol Key column, spefify the key to add or modify as:
+            \c <module_name>.<property_name>.
+
+        \li In the \uicontrol Value column, specify a value as a JSON literal.
+
+        \li Click \uicontrol OK.
 
     \endlist
 
+    The values that you have modified are displayed in red in the
+    \uicontrol {Profile properties} field.
+
     For a list of available keys and values, see the
     \l{http://doc.qt.io/qbs/list-of-modules.html}{List of Modules} in the
     Qbs Manual.

doc/src/projects/creator-projects-settings-build.qdoc

@@ -114,6 +114,10 @@
     the build step and add a custom build step that specifies another shell
     command.
 
+    To generate debug symbols also for applications compiled in release mode,
+    select the \uicontrol {Generate separate debug info} check box. For more
+    information, see \l{Using the CPU Usage Analyzer}.
+
     \QC is integrated to \l{http://doc.qt.io/QtQuickCompiler/}
     {Qt Quick Compiler} (commercial only) that enables you to compile QML source
     code into the final binary. This

doc/src/projects/creator-projects-settings-overview.qdoc

@@ -88,6 +88,11 @@
 
         \li \l{Specifying Dependencies}{Dependencies}
 
+        \li \l{Using Clang Static Analyzer}{Clang Static Analyzer Settings}
+            (commercial only)
+
+        \li \l{To-Do List}{To-Do Settings} (experimental)
+
     \endlist
 
     Use the \uicontrol Build and \uicontrol Run buttons to switch between the build and

doc/src/projects/creator-projects-targets.qdoc

@@ -114,6 +114,11 @@
             configuration that should be used by qmake. If you leave this field
             empty, the default mkspec of the selected Qt version is used.
 
+        \li In the \uicontrol {CMake Tool} field, select the CMake tool to use
+            for building the project. Select \uicontrol Manage to add installed
+            CMake tools to the list. For more information, see
+            \l{Adding CMake Tools}.
+
     \endlist
 
 */

doc/src/qtquick/qtquick-designer.qdoc

@@ -469,7 +469,7 @@
     \section2 Previewing Component Size
 
     The width and height of the root item in a QML file determine the size of
-    the component. You can reuse component, such as buttons, in different
+    the component. You can reuse components, such as buttons, in different
     sizes in other QML files and design screens for use with different device
     profiles, screen resolution, or screen orientation. The component size
     might also be zero (0,0) if its final size is determined by property

doc/src/qtquick/qtquick-exporting-qml.qdoc

@@ -39,7 +39,12 @@
     \note GIMP does not support grouping, and therefore, each layer is exported
     as an item in GIMP.
 
-    You can open the QML file in \QC for editing. If you edit the file in Adobe
+    You can open the QML file in \QC for editing. By default, the export scripts
+    generate Qt Quick 1 files. To edit the files in \QMLD, change the import
+    statements in the export scripts to import Qt Quick 2. Or, you can change
+    the import statement in each file after generating the files.
+
+    If you edit the file in Adobe
     Photoshop and export it to the same directory again, any changes you made in
     \QC are overwritten. However, you can re-export graphical assets without
     recreating the QML code.
@@ -114,13 +119,21 @@
 
     \list 1
 
-        \li Download the export script, \e{Export QML.jx}, from
-            \l{https://code.qt.io/cgit/qt-labs/photoshop-qmlexporter.git/}
-            {code.qt.io}.
+        \li Clone the repository that contains the export script,
+            \e{Export QML.jx}, from
+            \l{https://codereview.qt-project.org/#/admin/projects/qt-labs/photoshop-qmlexporter}
+            {Qt Code Review}.
 
             \note Read the README.txt file in the repository for latest
             information about the script.
 
+        \li To generate QML files that you can edit in \QMLD, edit the import
+            statement in \e {Export QML.jx}. For example:
+
+            \code
+            qmlfile.write("import QtQuick 2.5\n");
+            \endcode
+
         \li Double-click the export script to add the export command to the
             \uicontrol Scripts menu. You can also copy the script file to the Adobe
             Photoshop scripts directory (typically, \c{\Presets\Scripts} in the
@@ -160,21 +173,12 @@
     The script has been tested to work on GIMP 2. You can download GIMP 2 from
     \l{http://www.gimp.org/downloads/}{GIMP Downloads}.
 
-    To use the export script on Microsoft Windows, you also need to install the
-    GIMP Python extension (Python, PyCairo, PyGobject, PyGTK). However, GIMP is
-    not officially supported on Windows, so we cannot guarantee that this will
-    work.
-
     \list 1
 
-        \li On Microsoft Windows, you must first add Python support to your GIMP
-            installation, as instructed in
-            \l {http://www.gimpusers.com/tutorials/install-python-for-gimp-2-6-windows}
-            {Tutorial: Installing Python for GIMP 2.6 (Windows)}.
-
-        \li Download the export script, \e qmlexporter.py, from
-            \l{https://code.qt.io/cgit/qt-labs/gimp-qmlexporter.git/}
-            {code.qt.io}.
+        \li Clone the repository that contains the export script,
+            \e qmlexporter.py, from
+            \l{https://codereview.qt-project.org/#/admin/projects/qt-labs/gimp-qmlexporter}
+            {Qt Code Review}.
 
             \note Read the INSTALL.txt in the repository for latest information
             about the script.
@@ -186,6 +190,13 @@
 
             On Linux, run the following command: \c {chmod u+rx}
 
+        \li To generate QML files that you can edit in \QMLD, edit the import
+            statement in \e qmlexporter.py. For example:
+
+            \code
+            f.write('import QtQuick 2.5\n')
+            \endcode
+
         \li Restart GIMP to have the export command added to the \uicontrol File menu.
 
         \li Choose \uicontrol {File > Export to QML} to export the design to a QML

qbs/imports/QtcClangInstallation/functions.js

@@ -1,4 +1,17 @@
-function llvmConfig(qbs)
+var File = loadExtension("qbs.File")
+var MinimumLLVMVersion = "3.6.0"
+
+function isSuitableLLVMConfig(llvmConfigCandidate, qtcFunctions, processOutputReader)
+{
+    if (File.exists(llvmConfigCandidate)) {
+        var candidateVersion = version(llvmConfigCandidate, processOutputReader);
+        if (candidateVersion && candidateVersion.length)
+            return qtcFunctions.versionIsAtLeast(candidateVersion, MinimumLLVMVersion)
+    }
+    return false;
+}
+
+function llvmConfig(qbs, qtcFunctions, processOutputReader)
 {
     var llvmInstallDirFromEnv = qbs.getEnv("LLVM_INSTALL_DIR")
     var llvmConfigVariants = [
@@ -10,7 +23,7 @@ function llvmConfig(qbs)
     if (llvmInstallDirFromEnv) {
         for (var i = 0; i < llvmConfigVariants.length; ++i) {
             var variant = llvmInstallDirFromEnv + "/bin/" + llvmConfigVariants[i];
-            if (File.exists(variant))
+            if (isSuitableLLVMConfig(variant, qtcFunctions, processOutputReader))
                 return variant;
         }
     }
@@ -22,7 +35,7 @@ function llvmConfig(qbs)
     for (var i = 0; i < llvmConfigVariants.length; ++i) {
         for (var j = 0; j < pathList.length; ++j) {
             var variant = pathList[j] + "/" + llvmConfigVariants[i];
-            if (File.exists(variant))
+            if (isSuitableLLVMConfig(variant, qtcFunctions, processOutputReader))
                 return variant;
         }
     }

qtcreator.qbs

@@ -58,7 +58,6 @@ Project {
         "QT_NO_CAST_FROM_ASCII"
     ].concat(testsEnabled ? ["WITH_TESTS"] : [])
     qbsSearchPaths: "qbs"
-    property bool enableQbsJavaSupport: false
 
     references: [
         "src/src.qbs",