diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-10-20 15:01:00 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-10-20 15:01:00 +0200 |
| commit | 7b449c946392f77287ce1ca8ac2cede125bb780b (patch) | |
| tree | 3742c5012a28ec0accbee82326dd1d5357024675 /doc/qtdesignstudio | |
| parent | d643ad80cb9ad6e6b04d79e17799db3554b62085 (diff) | |
| parent | 029f926bcfcbb01757b53bf67410ffcbbbe28569 (diff) | |
| download | qt-creator-7b449c946392f77287ce1ca8ac2cede125bb780b.tar.gz | |
Merge commit '029f926bcfcbb01' (origin/8.0) into 9.0
Conflicts:
src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
src/plugins/qmldesigner/qmldesignerprojectmanager.cpp
Change-Id: Iff498a1024f4a152ebdd3516ba13fa16cb6932d9
Diffstat (limited to 'doc/qtdesignstudio')
| -rw-r--r-- | doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-effects.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-effects.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-effects.qdoc index a7a91ee8ee..158932dff8 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-effects.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-effects.qdoc @@ -11,8 +11,8 @@ \QDS provides a set of 3D effects, which are visible in the \l {2D} view. To apply a visual effect to a scene, drag-and-drop an effect from \uicontrol Components > \uicontrol {Qt Quick 3D} > - \uicontrol {Qt Quick 3D Effects} to a \uicontrol View3D component in - \l Navigator. + \uicontrol {Qt Quick 3D Effects} to a \uicontrol SceneEnvironment component + in \l Navigator. You can use the \l Effect component available in \uicontrol Components > \uicontrol {Qt Quick 3D} > \uicontrol {Qt Quick 3D} as the base |