Doc: Update info about build settings

QML debugging and profiling, separate debug info, and
Qt Quick Compiler are now enabled in the general build
settings. Default values can be set in Build & Run options.

Task-number: QTCREATORBUG-23686
Change-Id: I6eef8f270ab42cc563c3c95cfddf22243a5ef017
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

2 files changed, 29 insertions, 29 deletions

diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build-qbs.qdocinc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build-qbs.qdocinc
index 6a0bed76b5d..c77409ed196 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build-qbs.qdocinc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build-qbs.qdocinc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -41,15 +41,6 @@
         \li In the \uicontrol {Parallel jobs} field, specify the number of
             parallel jobs to use for building.
 
-        \li Select the \uicontrol {Enable QML debugging} check box to debug
-            Qt Quick application projects.
-
-            \note Debugging requires opening a socket at a well-known
-            port, which presents a security risk. Anyone on the Internet
-            could connect to the application that you are debugging and
-            execute any JavaScript functions. Therefore, you must make
-            sure that the port is properly protected by a firewall.
-
         \li In the \uicontrol Properties field, specify the properties to pass
             to the project. Use colons (:) to separate keys from values.
             For more information, see
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc
index 931285a5a5e..1b9cce351b8 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc
@@ -59,9 +59,12 @@
     Select the build configuration to edit in the
     \uicontrol {Edit build configuration} field.
 
+    The available build settings depend on the build system that you selected
+    for the project.
+
     \section2 qmake Build Configuration
 
-    \image qtcreator-projectpane.png
+    \image qtcreator-projectpane.png "qmake general build settings pane"
 
     By default, \QC builds projects in a separate directory from the source
     directory, as \l{glossary-shadow-build} {shadow builds}. This keeps the
@@ -80,6 +83,30 @@
     {scopes} to select the file to process depending on which platform qmake is
     run on.
 
+    To generate debug symbols also for applications compiled in release mode,
+    select \uicontrol Enable in the \uicontrol {Separate debug info} field. For
+    more information, see \l{Using the Performance Analyzer}. To use default
+    settings, select \uicontrol {Leave at Default}.
+
+    To set the default build properties, select \uicontrol Tools
+    > \uicontrol Options > \uicontrol {Build & Run} >
+    \uicontrol {Default Build Properties}.
+
+    \section3 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 new project wizards create Qt Quick projects that can be compiled,
+    because they are set up to use the Qt Resource System. To compile Qt Quick
+    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}.
+
     \include creator-projects-cmake-building.qdocinc cmake build configuration
 
     \section1 Starting External Processes
@@ -174,24 +201,6 @@
     \uicontrol {Override MAKEFLAGS} check box to override existing MAKEFLAGS
     variables.
 
-    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 Performance Analyzer}.
-
-    \section3 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 new project wizards create Qt Quick projects that can be compiled,
-    because they are set up to use the Qt Resource System. To compile Qt Quick
-    projects, select the \uicontrol {Enable Qt Quick Compiler} check box.
-
-    \note In earlier Qt versions, this was a commercial feature. For more
-    information, see \l{http://doc.qt.io/QtQuickCompiler/}{Qt Quick Compiler}.
-
     \include creator-projects-cmake-building.qdocinc cmake build steps
     \include creator-projects-settings-build-qbs.qdocinc qbs build steps