Merge remote-tracking branch 'origin/qds/dev'

Conflicts: src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
  src/plugins/updateinfo/updateinfoplugin.cpp
  src/tools/qml2puppet/CMakeLists.txt
  src/tools/qml2puppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp

Change-Id: I6b65ce2d603453fcebc2291574d55db80853f247

doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc

@@ -31,6 +31,13 @@
     can be built with CMake. You can open the \e CMakeLists.txt project file in
     Qt Creator to continue developing the project.
 
+    \target wizard-template-note
+    \note Since \QDS 3.9.0, \QDS project wizard templates generate projects that
+    automatically checkout and build the Qt Quick Studio Components from
+    \l{https://code.qt.io/cgit/qt-labs/qtquickdesigner-components.git/} {Qt Code Review},
+    using CMake. To turn off this feature, use the option \e BUILD_QDS_COMPONENTS
+    in the CMake configuration.
+
     \if defined(qtdesignstudio)
     For more information, see \l{Designer-Developer Workflow}.
     \else
@@ -149,10 +156,8 @@
 
     \section1 Adding Qt Quick Designer Components to Qt Installations
 
-    If you use Qt Quick Studio Components or Effects in your project, you have
-    to check out and install the \e {Qt Quick Designer Components} module from
-    \l{https://code.qt.io/cgit/qt-labs/qtquickdesigner-components.git/}
-    {Qt Code Review}.
+    Since \QDS 3.9, the Qt Quick Studio Components module is installed by default
+    as part of the application. You can also install the module manually.
 
     For example:
     \list 1

doc/qtdesignstudio/src/developers/studio-designer-developer-workflow.qdoc

@@ -32,8 +32,8 @@
     your project as a fully working C++ application with developers.
 
     If you add or remove QML files in \QDS, you have to regenerate the
-    \e CMakeLists.txt project configuration file by selecting \uicontrol Build
-    > \uicontrol Run > \uicontrol {Generate CMakeLists.txt Files}.
+    \e CMakeLists.txt project configuration file by selecting \uicontrol File
+    > \uicontrol {Export Project} > \uicontrol {Generate CMake Build Files}.
 
     If you use Git, you can clone an example project
     \l{https://git.qt.io/public-demos/qtdesign-studio/-/tree/master/playground/AuroraCluster0}
@@ -99,6 +99,8 @@
     This isn't mandatory.
 
     \li Generate CMake files and C++ source files that are used to compile the application into
-    an executable file by selecting \uicontrol Build > \uicontrol{Generate CMakeLists.txt files}.
+    an executable file by selecting \uicontrol File > \uicontrol {Export Project} >
+    \uicontrol {Generate CMake Build Files}.
+
     \endlist
 */

doc/qtdesignstudio/src/qtbridge/qtbridge-figma-setup.qdoc

@@ -10,11 +10,19 @@
     \note \QBF is included in the
     \l{https://www.qt.io/pricing}{\QDS Enterprise license}.
 
-    \QBF is delivered with \QDS as a developer plugin that you can install to
-    the Desktop version of Figma. To install the plugin, open the Plugin Manager
-    of Figma and press the plus button to create a new plugin. Then choose the
-    \e Manifest.json file that comes with \QDS.
+    You need both Figma and Qt accounts to use \QBF in \QDS.
+    To use \QBF in \QDS:
+    \list 1
+        \li Go to \l {https://www.figma.com/community/plugin/1167809465162924409/Qt-Bridge-for-Figma}
+        {\QBF plugin page}.
+        \li Select \uicontrol {Try it out}.
+        \li Select your logged in Figma account.
+        \li After the plugin loads, select \uicontrol Run.
+        \li Select \uicontrol Export, to get the \e {.qtbridge} file in your
+        local drive.
+        \li In \QDS, drag the file to the \uicontrol 2D, \uicontrol 3D, \uicontrol Assets,
+        or \uicontrol Navigator view in an open project .
+    \endlist
 
-    You can launch the Figma plugin from \uicontrol Plugins >
-    \uicontrol Development > \uicontrol {\QBF} in Figma.
+    You can launch the installed Figma plugin from \uicontrol Plugins > \uicontrol {\QBF} in Figma.
 */

doc/qtdesignstudio/src/qtdesignstudio-packaging.qdoc

@@ -24,9 +24,9 @@
     set of files (icons, translation files, and so on) and you don't want
     to run the risk of losing the files.
 
-    To package your application, select \uicontrol Build >
-    \uicontrol {Generate QRC Resource File}. Then select the
-    files to package in the \uicontrol {Add Resources} dialog.
+    To package your application, select \uicontrol File >
+    \uicontrol {Export Project} > \uicontrol {Generate QRC Resource File}.
+    Then select the files to package in the \uicontrol {Add Resources} dialog.
 
     \image studio-add-resources.png "Add Resources dialog"
 
@@ -44,10 +44,11 @@
 
     \section1 Embedding Resources into Applications
 
-    Alternatively, you can embedd the resources into your application by
-    selecting \uicontrol Build > \uicontrol {Generate Deployable Package}.
-    Select the location for the .qmlrc file, and then select the files to
-    embedd in the \uicontrol {Add Resources} dialog.
+    Alternatively, you can embed the resources into your application by
+    selecting \uicontrol File > \uicontrol {Export Project} >
+    \uicontrol {Generate Deployable Package}. Select the location for
+    the .qmlrc file, and then select the files to embed in the
+    \uicontrol {Add Resources} dialog.
 
     When you select \uicontrol OK, \QDS creates a resource collection file
     (.qmlrc) in the location you selected.