Merge remote-tracking branch 'origin/10.0'

Change-Id: I7a3925ad8e4f97461b64a70217102ed900430253

4 files changed, 10 insertions, 6 deletions

diff --git a/doc/qtcreator/images/qtcreator-project-qt-quick.webp b/doc/qtcreator/images/qtcreator-project-qt-quick.webp
index 48a83d2dda..ac329a5c43 100644
--- a/doc/qtcreator/images/qtcreator-project-qt-quick.webp
+++ b/doc/qtcreator/images/qtcreator-project-qt-quick.webp
diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc
index f92d29625b..5545834964 100644
--- a/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc
+++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc
@@ -45,6 +45,10 @@
 
             \image qtcreator-project-qt-quick.webp {New Project dialog}
 
+            \note To use \l qmake as the build system, develop with Qt 5,
+            or add translations to the application, select
+            \uicontrol {Qt Quick Application (compat)}.
+
         \li In the \uicontrol {Project Location} dialog, \uicontrol Name field,
             enter a name for the project. Keep in mind that you cannot easily
             change the project name later.
@@ -63,8 +67,8 @@
             \QDS, select \uicontrol {Create a project that you can open in \QDS}.
 
         \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}.
+            use for building and running the project: \l {Setting Up CMake}
+            {CMake} or \l {Setting Up Qbs}{Qbs}.
 
         \li Select \uicontrol Next to open the
             \uicontrol {Define Project Details} dialog.
diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-tutorial-create-empty-project.qdocinc b/doc/qtcreator/src/qtquick/creator-only/qtquick-tutorial-create-empty-project.qdocinc
index 9fd1af9b34..d0a5b94cc0 100644
--- a/doc/qtcreator/src/qtquick/creator-only/qtquick-tutorial-create-empty-project.qdocinc
+++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-tutorial-create-empty-project.qdocinc
@@ -30,8 +30,8 @@
             {CMake} as the build system to use for building and running the
             project.
 
-            \note If you select \l qmake, the instructions for configuring the
-            project won't apply.
+            \note If you select \l {Setting Up Qbs}{Qbs}, the instructions for
+            configuring the project won't apply.
 
         \li Select \uicontrol Next to open the
             \uicontrol {Define Project Details} dialog.
diff --git a/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc b/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc
index d211b570d2..ad38116dff 100644
--- a/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc
+++ b/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc
@@ -15,8 +15,8 @@
     \title Creating a Qt Widget Based Application
 
     This tutorial describes how to use \QC to create a small Qt application,
-    Text Finder. It is a simplified version of the Qt UI Tools \l{Text Finder
-    Example}. We use \QD to construct the application user interface from
+    Text Finder. It is a simplified version of the Qt UI Tools \l{Text Finder}
+    example. You'll use \QD to construct the application user interface from
     Qt widgets and the code editor to write the application logic in C++.
 
     \image qtcreator-textfinder-screenshot.png