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