Doc: Describe selecting the build system in project wizards

Change-Id: I853676d922ee688385cecb1e498bc4ea2c66fc04
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>

doc/src/projects/creator-projects-build-systems.qdocinc

+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt Creator documentation.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
+**
+****************************************************************************/
+
+// **********************************************************************
+// NOTE: the sections are not ordered by their logical order to avoid
+// reshuffling the file each time the index order changes (i.e., often).
+// Run the fixnavi.pl script to adjust the links to the index order.
+// **********************************************************************
+
+/*!
+//! [build systems]
+
+    \section1 Selecting the Build System
+
+    Most \QC project wizards enable you to choose the build system to use for
+    building the project: qmake, CMake, or Qbs. If you are not presented with a
+    choice, the project is set up to use qmake.
+
+    \l{qmake Manual}{qmake} is a cross-platform system for build automation
+    that helps simplify the build process for development projects across
+    different platforms. qmake automates the generation of build configurations
+    so that only a few lines of information are needed to create each
+    configuration. qmake is installed and configured when you install Qt.
+    To use one of the other supported build systems, you need to set it up.
+
+    \l {CMake Manual}{CMake} is an alternative to qmake for automating the
+    generation of build configurations. For more information, see
+    \l {Setting Up CMake}.
+
+    \l{Qbs Manual}{Qbs} is an all-in-one build tool that generates a build graph
+    from a high-level project description (like qmake or CMake do) and executes
+    the commands in the low-level build graph (like make does). For more
+    information, see \l{Setting Up Qbs}.
+
+    To change the location of the project directory, and to specify settings
+    for building and running projects, select \uicontrol Tools >
+    \uicontrol Options > \uicontrol {Build & Run} > \uicontrol General. The
+    \uicontrol CMake tab contains additional CMake settings.
+
+    To specify build profiles for Qbs, select \uicontrol Tools >
+    \uicontrol Options > \uicontrol Qbs.
+
+    To specify build and run settings for different target platforms,
+    select \uicontrol Projects. For more information on the options you have,
+    see \l{Specifying Build Settings}.
+
+//! [build systems]
+*/

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

 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -57,14 +57,9 @@
     the necessary files for you. You can add your own custom wizards to
     standardize the way subprojects and classes are added to a project.
 
-    Most wizards create projects that use the Qt build tool, qmake. It is a
-    cross-platform system for build automation that helps simplify the build
-    process for development projects across different platforms. qmake
-    automates the generation of build configurations so that only a few lines
-    of information are needed to create each configuration. For more
-    information about qmake, see the \l{qmake Manual}.
-    You can modify the build and run settings for qmake projects in the
-    \uicontrol Projects mode.
+    Most \QC project wizards enable you to choose the build system to use for
+    building the project: qmake, CMake, or Qbs. If you are not presented with a
+    choice, the project is set up to use qmake.
 
     You can use wizards also to create plain C or C++ projects that use
     qmake, Qbs, or CMake, but do not use the Qt library.
@@ -79,6 +74,8 @@
     install and configure some additional software on the devices to be able to
     connect to them from the development PC.
 
+    \include creator-projects-build-systems.qdocinc build systems
+
     \section1 Using Project Wizards
 
     In the first step, you select a template for the project. You can filter
@@ -266,13 +263,6 @@
     For more information about creating Qt Quick projects, see
     \l {Creating Qt Quick Projects}.
 
-    To change the location of the project directory, and to specify settings
-    for building and running projects, select \uicontrol{Tools} > \uicontrol{Options} >
-    \uicontrol{Build & Run} > \uicontrol{General}.
-
-    To specify build and run settings for different target platforms,
-    select \uicontrol Projects.
-
     \section1 Adding Files to Projects
 
     You can use wizards also to add individual files to your projects.

doc/src/qtquick/creator-tutorial-create-qq-project.qdocinc

@@ -40,6 +40,10 @@
             files, and then select \uicontrol Next (or \uicontrol Continue on
             \macos).
 
+        \li In the \uicontrol {Build system} field, select the build system to
+            use for building and running the project: \l qmake,
+            \l {Setting Up CMake}{CMake}, or \l {Setting Up Qbs}{Qbs}.
+
         \li In the \uicontrol {Qt Quick Controls 2 Style} field, select one of
             the predefined \l{Styling Qt Quick Controls 2}{UI styles} to use,
             and then select \uicontrol Next.