Merge remote-tracking branch 'origin/4.2'

 Conflicts:
	doc/src/qtquick/creator-tutorial-create-qq-project.qdocinc
	doc/src/qtquick/qtquick-creating.qdoc
	doc/src/qtquick/qtquick-uiforms-tutorial.qdoc
	share/qtcreator/welcomescreen/qtcreator_tutorials.xml
	src/plugins/git/gitgrep.cpp
	src/shared/qbs

Change-Id: I6f4d168d888d9547c3af0819f79cc9ebb4186ca0

6 files changed, 89 insertions, 4 deletions

diff --git a/doc/src/qtquick/creator-mobile-app-tutorial.qdoc b/doc/src/qtquick/creator-mobile-app-tutorial.qdoc
index ed7dbfc3c7..fc6b130bd6 100644
--- a/doc/src/qtquick/creator-mobile-app-tutorial.qdoc
+++ b/doc/src/qtquick/creator-mobile-app-tutorial.qdoc
@@ -66,7 +66,7 @@
     Program certificate that you receive from Apple. For more information, see
     \l{Connecting iOS Devices}.
 
-    \include creator-tutorial-create-qq-project.qdocinc
+    \include creator-tutorial-create-qq-project.qdocinc qt quick application
 
     \section1 Creating the Accelbubble Main View
 
diff --git a/doc/src/qtquick/creator-projects-settings-run-qtquick.qdocinc b/doc/src/qtquick/creator-projects-settings-run-qtquick.qdocinc
index 2647559209..4d1561b47c 100644
--- a/doc/src/qtquick/creator-projects-settings-run-qtquick.qdocinc
+++ b/doc/src/qtquick/creator-projects-settings-run-qtquick.qdocinc
@@ -1,3 +1,31 @@
+/****************************************************************************
+**
+** 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.
+**
+****************************************************************************/
+
+/*!
+//! [run settings qt quick ui]
+
     \section1 Specifying Run Settings for Qt Quick UI Projects
 
     You can specify run settings for \l{glossary-buildandrun-kit}{kits}
@@ -14,3 +42,6 @@
     \endlist
 
     \image qmldesigner-run-settings.png "Run settings for Qt Quick UI projects"
+
+//! [run settings qt quick ui]
+*/
diff --git a/doc/src/qtquick/creator-tutorial-create-qq-project.qdocinc b/doc/src/qtquick/creator-tutorial-create-qq-project.qdocinc
index 0feb6d36e3..e254ae23a2 100644
--- a/doc/src/qtquick/creator-tutorial-create-qq-project.qdocinc
+++ b/doc/src/qtquick/creator-tutorial-create-qq-project.qdocinc
@@ -1,3 +1,31 @@
+/****************************************************************************
+**
+** 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.
+**
+****************************************************************************/
+
+/*!
+//! [qt quick application]
+
     \section1 Creating Qt Quick Controls 2 Applications
 
     \list 1
@@ -38,3 +66,6 @@
     \QMLD \uicontrol {Form Editor} and two QML files, \e Page1.qml and
     \e main.qml, that you can modify in the \uicontrol {Text Editor} to add the
     application logic.
+
+//! [qt quick application]
+*/
diff --git a/doc/src/qtquick/qtquick-app-tutorial.qdoc b/doc/src/qtquick/qtquick-app-tutorial.qdoc
index 527992807f..dbbee8e71b 100644
--- a/doc/src/qtquick/qtquick-app-tutorial.qdoc
+++ b/doc/src/qtquick/qtquick-app-tutorial.qdoc
@@ -54,7 +54,7 @@
     For examples of using Qt Quick Controls 2, see
     \l{Qt Quick Controls 2 Examples}.
 
-    \include creator-tutorial-create-qq-project.qdocinc
+    \include creator-tutorial-create-qq-project.qdocinc qt quick application
 
     \section1 Creating the Main View
 
diff --git a/doc/src/qtquick/qtquick-creating.qdoc b/doc/src/qtquick/qtquick-creating.qdoc
index 0d85aaef24..ebaa3b7e92 100644
--- a/doc/src/qtquick/qtquick-creating.qdoc
+++ b/doc/src/qtquick/qtquick-creating.qdoc
@@ -60,10 +60,14 @@
             \l{http://threejs.org}{three.js}.
 
         \li \uicontrol {Qt Quick 2 UI} (in the \uicontrol {Other Project}
-            category) creates a Qt Quick UI project with a single QML file that
+            category) creates a \l{Creating Qt Quick UI Projects}
+            {Qt Quick UI project} with a single QML file that
             contains the main view. You can review Qt Quick 2 UI projects in the
             \l{Previewing QML Files}{QML Scene preview tool}. You do not need to
             build them, because they do not contain any C++ code.
+            Qt Quick UI projects cannot be deployed to embedded or mobile
+            target platforms. For those platforms, create a Qt Quick application
+            instead.
 
         \li \uicontrol {Qt Quick 2 Extension Plugin} (in the \uicontrol Library category)
             create C++ plugins that make it possible to offer extensions that
@@ -121,6 +125,18 @@
 
     \section1 Creating Qt Quick UI Projects
 
+    Qt Quick UI projects are useful for testing or prototyping user interfaces,
+    or for setting up a separate project just for QML editing, for example. You
+    cannot use them for application development, because they do not contain:
+
+    \list
+        \li C++ code
+        \li Resource files (.qrc)
+        \li Code needed for deploying applications to mobile or embedded devices
+    \endlist
+
+    To create a Qt Quick UI project:
+
     \list 1
 
         \li Select \uicontrol File > \uicontrol {New File or Project} >
diff --git a/doc/src/qtquick/qtquick-designer.qdoc b/doc/src/qtquick/qtquick-designer.qdoc
index edcf18a9c7..128689d06c 100644
--- a/doc/src/qtquick/qtquick-designer.qdoc
+++ b/doc/src/qtquick/qtquick-designer.qdoc
@@ -279,10 +279,17 @@
 
     \image qmldesigner-text-property-tr.png "Text properties"
 
-    The text string is enclosed in a \c qsTr call.
+    By default, the text string is enclosed in a \c qsTr() call.
 
     \image qml-translate.png "Text marked for translation"
 
+    If you use text IDs instead of plain text, change the default call to
+    \c qsTrId(). Select \uicontrol Tools > \uicontrol Options >
+    \uicontrol {Qt Quick} > \uicontrol {Qt Quick Designer}, and then select the
+    \uicontrol {qsTrId()} radio button in the \uicontrol Internationalization
+    group. For more information about text ID based translations, see
+    \l {Qt Linguist Manual: Text ID Based Translations}.
+
     \section2 Loading Placeholder Data
 
     \QMLD supports views, models, and delegates, so that when you add a Grid