summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorPranta Dastider <pranta.dastider@qt.io>2022-12-14 17:32:19 +0100
committerPranta Ghosh Dastider <pranta.dastider@qt.io>2022-12-15 15:48:15 +0000
commit51fe3ca59e878f4c87359e9777cd7057e760c553 (patch)
tree528263913f2aac3c16a36248f267299f6c360abb /doc
parent8b1233c11ef0b53647784d1d3afa2bd7fda833ad (diff)
downloadqt-creator-51fe3ca59e878f4c87359e9777cd7057e760c553.tar.gz
QmlDesigner: Update component integration instructions for CMake
Starting with QDS 3.9 the cmake projects can download and add the Qt Quick Studio Components to the application project. This patch updates that notion into the document. Fixes: QDS-8603 Change-Id: I7555b04eca72fc09bc9c73b0954f58aec2f3ddd5 Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'doc')
-rw-r--r--doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc13
1 files changed, 9 insertions, 4 deletions
diff --git a/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc b/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc
index 1e6956a449..7283673037 100644
--- a/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc
+++ b/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