Doc: update info about qmake build configuration

Change-Id: I40e7491b079ae879d97b595fb2d440b92a11d66b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

doc/qtcreator/src/debugger/qtquick-debugging.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -64,7 +64,10 @@
 
         \list 1
 
-        \li Debugging is enabled by default for Qt 5.0, or later.
+        \li If you use qmake as the build system, make sure that
+            debugging is enabled in the \uicontrol {Build Settings},
+            \uicontrol {QML debugging and profiling} field, either
+            explicitly for the project or globally by default.
 
             \image qtcreator-projectpane.png "qmake general build settings pane"
 

doc/qtcreator/src/projects/creator-only/creator-build-settings-qmake.qdoc

@@ -30,20 +30,25 @@
 
     \title qmake Build Configuration
 
-    \image qtcreator-projectpane.png "qmake general build settings pane"
+    \image qtcreator-projectpane.png "qmake build settings"
 
     By default, \QC builds qmake projects in a separate directory from the
     source directory, as \l{glossary-shadow-build} {shadow builds}. This
     keeps the files generated for each \l{glossary-buildandrun-kit}
     {build and run kit} separate. If you only build and run with a single
     \l{glossary-buildandrun-kit}{kit}, you can deselect the
-    \uicontrol {Shadow build} checkbox.
+    \uicontrol {Shadow build} checkbox. Select the build directory in the
+    \uicontrol {Build Directory} field.
 
     To make in-source builds the default option for all projects, select
     \uicontrol Tools > \uicontrol Options > \uicontrol {Build & Run} >
     \uicontrol {Default Build Properties}, and enter a period (.) in the
     \uicontrol {Default build directory} field.
 
+    In the \uicontrol {Tooltip in target selector} field, you can enter text
+    that is displayed as a tooltip when you hover the mouse over the build
+    configuration in the \l{Building for Multiple Platforms}{kit selector}.
+
     You can create separate versions of project files to keep platform-dependent
     code separate. You can use qmake \l{Adding Platform Specific Source Files}
     {scopes} to select the file to process depending on which platform qmake is
@@ -54,10 +59,41 @@
     more information, see \l{Using the Performance Analyzer}. To use default
     settings, select \uicontrol {Leave at Default}.
 
+    In the \uicontrol {qmake system() behavior when parsing} field, you can
+    select whether processes are run via qmake's \c system() function or
+    ignored. Setting this option to \uicontrol Ignore might help if opening
+    or closing projects takes too long, but it might produce inexact parsing
+    results.
+
+    \section1 Global qmake Settings
+
+    To specify settings for all qmake builds, select \uicontrol Tools
+    > \uicontrol Options > \uicontrol {Build & Run} >
+    \uicontrol Qmake.
+
+    \image qtcreator-build-settings-qmake.png "qmake build and run options"
+
     To set the default build properties, select \uicontrol Tools
     > \uicontrol Options > \uicontrol {Build & Run} >
     \uicontrol {Default Build Properties}.
 
+    \image qtcreator-build-settings-default.png "default build options"
+
+    \section1 Compiling QML
+
+    Since Qt 5.11, you can compile QML source code into the final binary. This
+    improves the startup time of the application and eliminates the need to
+    deploy QML files together with the application. For more information, see
+    \l{Ahead-of-Time Compilation}.
+
+    \QC project wizard templates create Qt Quick projects that can be compiled,
+    because they are set up to use the Qt Resource System. To compile QML code,
+    select \uicontrol Enable in the \uicontrol {Qt Quick Compiler} field. To
+    use default settings, select \uicontrol {Leave at Default}.
+
+    \note In earlier Qt versions, this was a commercial feature. For more
+    information, see \l{http://doc.qt.io/QtQuickCompiler/}{Qt Quick Compiler}.
+
     \section1 qmake Build Steps
 
     \QC builds qmake projects by running the \c make or \c nmake command from
@@ -74,4 +110,11 @@
     jobs to use for building in the \uicontrol {Parallel jobs} field. Select the
     \uicontrol {Override MAKEFLAGS} check box to override existing MAKEFLAGS
     variables.
+
+    Select \uicontrol {Add Build Step} > \uicontrol {IncrediBuild for Linux} or
+    \uicontrol {IncrediBuild for Windows} to accelerate builds by using
+    \l{IncrediBuild Build Configuration}{IncrediBuild}.
+
+    Select \uicontrol {Add Build Step} > \uicontrol {Run Conan Install} to use
+    the \l{Conan Build Configuration}{Conan} package manager with qmake
 */

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

@@ -89,21 +89,8 @@
 
     This topic describes the build settings at a general level.
 
-    \section1 Compiling QML
+    For more information about debugging Qt Quick projects, see
-
+    \l{Setting Up QML Debugging}.
-    Since Qt 5.11, you can compile QML source code into the final binary. This
-    improves the startup time of the application and eliminates the need to
-    deploy QML files together with the application. For more information, see
-    \l{Ahead-of-Time Compilation}.
-
-    \QC project wizard templates create Qt Quick projects that can be compiled,
-    because they are set up to use the Qt Resource System. To compile QML code
-    for debugging and profiling the project, select \uicontrol Enable in the
-    \uicontrol {QML debugging and profiling} field. To use default settings,
-    select \uicontrol {Leave at Default}.
-
-    \note In earlier Qt versions, this was a commercial feature. For more
-    information, see \l{http://doc.qt.io/QtQuickCompiler/}{Qt Quick Compiler}.
 
     \section1 Starting External Processes