aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMats Honkamaa <mats.honkamaa@qt.io>2022-09-27 11:25:59 +0300
committerMats Honkamaa <mats.honkamaa@qt.io>2022-09-27 11:51:56 +0000
commit67112a581fe0864b99e8a45ae47611d714fb20a2 (patch)
tree255b3a3401419fb697f01b6093f01a7e34a07e7e
parent3b4b8aec4b6642eb71e48f0ea78f77de400196bb (diff)
Doc: Fix branding issue
\QC rendered as Qt Design Studio in places where it should be Qt Creator. Task-number: QDS-7712 Change-Id: I16df93bbb7881c280e96aede32f5619d1228b8f5 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
-rw-r--r--doc/qtdesignstudio/src/components/qtquick-data-models.qdoc2
-rw-r--r--doc/qtdesignstudio/src/components/qtquick-images.qdoc2
-rw-r--r--doc/qtdesignstudio/src/components/qtquick-positioning.qdoc4
-rw-r--r--doc/qtdesignstudio/src/developers/studio-designer-developer-workflow.qdoc9
-rw-r--r--doc/qtdesignstudio/src/overviews/qtquick-animation-overview.qdoc2
-rw-r--r--doc/qtdesignstudio/src/overviews/qtquick-production-quality-animation.qdoc2
-rw-r--r--doc/qtdesignstudio/src/overviews/qtquick-prototyping.qdoc2
-rw-r--r--doc/qtdesignstudio/src/overviews/qtquick-uis.qdoc4
-rw-r--r--doc/qtdesignstudio/src/qtdesignstudio-developer-topics.qdoc2
-rw-r--r--doc/qtdesignstudio/src/qtdesignstudio-faq.qdoc16
-rw-r--r--doc/qtdesignstudio/src/qtdesignstudio-terms.qdoc2
-rw-r--r--doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-optimized-3d-scenes.qdoc4
-rw-r--r--doc/qtdesignstudio/src/views/qtquick-navigator.qdoc4
-rw-r--r--doc/qtdesignstudio/src/views/qtquick-properties.qdoc2
-rw-r--r--doc/qtdesignstudio/src/views/studio-workspaces.qdoc6
15 files changed, 32 insertions, 31 deletions
diff --git a/doc/qtdesignstudio/src/components/qtquick-data-models.qdoc b/doc/qtdesignstudio/src/components/qtquick-data-models.qdoc
index 98b6343924..8b2f287eb2 100644
--- a/doc/qtdesignstudio/src/components/qtquick-data-models.qdoc
+++ b/doc/qtdesignstudio/src/components/qtquick-data-models.qdoc
@@ -161,7 +161,7 @@
When you add a \l{GridView}{Grid View}, \l{ListView}{List View}, or
\l{PathView}{Path View}, the ListModel and the delegate component that
creates an instance for each item in the model are added automatically.
- For grid and list views, you can edit the list model in \QC.
+ For grid and list views, you can edit the list model in \QDS.
\image qtquick-designer-listview-preview.png "Preview of a list view"
diff --git a/doc/qtdesignstudio/src/components/qtquick-images.qdoc b/doc/qtdesignstudio/src/components/qtquick-images.qdoc
index 1710566467..b590308247 100644
--- a/doc/qtdesignstudio/src/components/qtquick-images.qdoc
+++ b/doc/qtdesignstudio/src/components/qtquick-images.qdoc
@@ -50,7 +50,7 @@
\image qtquick-designer-image-type.png "Image component in different views"
When you drag-and-drop an image file from \uicontrol Assets to \l Navigator
- or the \l {2D} view, \QC automatically
+ or the \l {2D} view, \QDS automatically
creates an instance of the Image component for you with the path to the
image file set as the value of the \uicontrol Source field in
\uicontrol Properties.
diff --git a/doc/qtdesignstudio/src/components/qtquick-positioning.qdoc b/doc/qtdesignstudio/src/components/qtquick-positioning.qdoc
index 21b3d663ae..35e6d48624 100644
--- a/doc/qtdesignstudio/src/components/qtquick-positioning.qdoc
+++ b/doc/qtdesignstudio/src/components/qtquick-positioning.qdoc
@@ -95,7 +95,7 @@
For more information on the JavaScript environment provided, see
\l{Integrating QML and JavaScript}.
- Bindings are a black box for \QC and using them might have a
+ Bindings are a black box for \QDS and using them might have a
negative impact on performance, so consider setting anchors and margins for
components, instead. For example, instead of setting \c {parent.width} for a
component, you could anchor the component to its sibling components on the
@@ -364,7 +364,7 @@
to right and top to bottom. Each component is positioned at the top-left
corner of its cell with position (0, 0).
- \QC generates the grid based on the positions of the child components in
+ \QDS generates the grid based on the positions of the child components in
the \l {2D} view. You can modify the number of rows and columns in the
\uicontrol Rows and \uicontrol Columns fields.
diff --git a/doc/qtdesignstudio/src/developers/studio-designer-developer-workflow.qdoc b/doc/qtdesignstudio/src/developers/studio-designer-developer-workflow.qdoc
index 629642abd7..aa4fb83d01 100644
--- a/doc/qtdesignstudio/src/developers/studio-designer-developer-workflow.qdoc
+++ b/doc/qtdesignstudio/src/developers/studio-designer-developer-workflow.qdoc
@@ -49,7 +49,7 @@
working Qt 6 application that you can build and run in Qt Creator using
CMake. Therefore, you can open, build, and run the projects with Qt Creator.
- \QDS continues to use the \e .qmlproject file format, while \QC uses a
+ \QDS continues to use the \e .qmlproject file format, while Qt Creator uses a
\e CMakeLists.txt file as the project file. This enables you to share
your project as a fully working C++ application with developers.
@@ -68,9 +68,10 @@
\section1 Converting Project Structure for CMake
- \QDS can generate \e CMakeLists.txt and other related files to use with \QC and to compile into
- an executable application but only if the project has a certain folder structure. If you have a
- \QDS QML project that doesn't have the CMake configuration, follow these steps to convert it's
+ \QDS can generate \e CMakeLists.txt and other related files to use with
+ Qt Creator and to compile into an executable application but only if the
+ project has a certain folder structure. If you have a \QDS QML project that
+ doesn't have the CMake configuration, follow these steps to convert it's
file structure to correct format.
\list 1
diff --git a/doc/qtdesignstudio/src/overviews/qtquick-animation-overview.qdoc b/doc/qtdesignstudio/src/overviews/qtquick-animation-overview.qdoc
index 8816a05a52..d78d6cf2fa 100644
--- a/doc/qtdesignstudio/src/overviews/qtquick-animation-overview.qdoc
+++ b/doc/qtdesignstudio/src/overviews/qtquick-animation-overview.qdoc
@@ -68,7 +68,7 @@
\section2 Timeline and Keyframe Based Animation
- Timeline animation is based on \e keyframes. In \QC, keyframes determine the
+ Timeline animation is based on \e keyframes. In \QDS, keyframes determine the
value of the property of a \l{glossary_component}{component} at a certain
time. Animating properties enables their values to move through intermediate
values instead of immediately changing to the target value.
diff --git a/doc/qtdesignstudio/src/overviews/qtquick-production-quality-animation.qdoc b/doc/qtdesignstudio/src/overviews/qtquick-production-quality-animation.qdoc
index bfdf435cf6..07b9bc7eb8 100644
--- a/doc/qtdesignstudio/src/overviews/qtquick-production-quality-animation.qdoc
+++ b/doc/qtdesignstudio/src/overviews/qtquick-production-quality-animation.qdoc
@@ -70,7 +70,7 @@
\section1 Profiling UI Code
You can use \l{Profiling QML Applications}{QML Profiler} that is integrated
- into \QC to find causes for typical performance problems in your UI. For
+ into \QDS to find causes for typical performance problems in your UI. For
example, your UI might be slow, unresponsive, or stuttering. Typically, such
problems are caused by executing too much JavaScript in too few frames. All
JavaScript must return before the GUI thread can proceed, and frames are
diff --git a/doc/qtdesignstudio/src/overviews/qtquick-prototyping.qdoc b/doc/qtdesignstudio/src/overviews/qtquick-prototyping.qdoc
index 1e9c784000..468f24048b 100644
--- a/doc/qtdesignstudio/src/overviews/qtquick-prototyping.qdoc
+++ b/doc/qtdesignstudio/src/overviews/qtquick-prototyping.qdoc
@@ -95,7 +95,7 @@
\li \l {Importing 3D Assets}
- You can import exported assets into \QC. For a list of formats
+ You can import exported assets into \QDS. For a list of formats
supported by each \l{Qt Quick 3D} version, see the module
documentation.
diff --git a/doc/qtdesignstudio/src/overviews/qtquick-uis.qdoc b/doc/qtdesignstudio/src/overviews/qtquick-uis.qdoc
index 44316cc260..abbdbed09e 100644
--- a/doc/qtdesignstudio/src/overviews/qtquick-uis.qdoc
+++ b/doc/qtdesignstudio/src/overviews/qtquick-uis.qdoc
@@ -42,14 +42,14 @@
components, and states, you need. Create a descriptive wireframe
and acquire a detailed UI specification before you start to make
the process of creating the UI more efficient.
- \QC enables you to turn your UI concept into a wireframe with
+ \QDS enables you to turn your UI concept into a wireframe with
a scalable layout where all your screens and controls are in
place. You can present your wireframe to developers and other
stakeholders for discussion, review, and approval before
continuing into the prototyping phase.
\endtable
- In \QC, you build UIs around the behavior of \l{glossary-component}
+ In \QDS, you build UIs around the behavior of \l{glossary-component}
{components} and how they connect with one another. You can use preset
components available in the \l Components view or combine them to create
your own components. You can specify values for the \e properties of a
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-developer-topics.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-developer-topics.qdoc
index e01fdd5523..03246e8dae 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-developer-topics.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-developer-topics.qdoc
@@ -48,7 +48,7 @@
\li \l{Converting UI Projects to Applications}
\QDS projects are useful for creating UIs. To use them for
- application development in \QC, you have to convert
+ application development in Qt Creator, you have to convert
them to Qt Quick Application projects that contain .pro,
.cpp, and .qrc files.
\li \l{Using External Tools}
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-faq.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-faq.qdoc
index 751bff64ab..00b090667b 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-faq.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-faq.qdoc
@@ -41,7 +41,7 @@
\li \l {FAQ - Assets}{Assets}
\li \l {FAQ - Components}{Components}
\li \l {FAQ - Views}{Views}
- \li \l {FAQ - Integration Between \QDS and \QC}{Integration Between \QDS and \QC}
+ \li \l {FAQ - Integration Between \QDS and Qt Creator}{Integration Between \QDS and Qt Creator}
\li \l {FAQ - Performance}{Performance}
\li \l {FAQ - Data Simulation}{Data Simulation}
\endlist
@@ -89,7 +89,7 @@
\section1 FAQ - Components
- \section2 Can custom components be used?
+ \section2 Can I use custom components?
Yes, you can create custom components and controls by using wizard templates
or move component instances into separate files to turn them into new
@@ -103,7 +103,7 @@
For more information, see \l {Importing 3D Assets}.
- \section2 How to integrate custom C++ components into QDS?
+ \section2 How can I integrate custom C++ components into QDS?
You must create your own QML module that contains the components and
provides additional information about your components. For more information,
@@ -121,21 +121,21 @@
For more information, see the \l {3D} view.
- \section1 FAQ - Integration Between \QDS and \QC
+ \section1 FAQ - Integration Between \QDS and Qt Creator
- \section2 Is there a way to automatically propagate name changes between \QDS and \QC?
+ \section2 Can I automatically propagate name changes between \QDS and Qt Creator?
Unfortunately we do not automate renaming files between tools at the moment.
If you decide to change the name of a property, alias, or signal in \QDS,
- you need to manually change the name in \QC to maintain the connection.
+ you need to manually change the name in Qt Creator to maintain the connection.
However, you can rename symbols in all files within a project. To rename a
QML type in a project, select \uicontrol Tools > \uicontrol QML/JS >
\uicontrol {Rename Symbol Under Cursor} or press \key Ctrl+Shift+R. For more
information, see \l {Renaming Symbols}.
- \section2 When turning your \QDS project into application in \QC, what is the best way to add .qml files?
+ \section2 How can I add .qml files to my project in Qt Creator?
- Use the project wizard templates to create an application in \QC and copy
+ Use the project wizard templates to create an application in \QDS and copy
your .qml files to the project folder. Then make some changes to the project
configuration and source files, as instructed in
\l {Converting UI Projects to Applications}.
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-terms.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-terms.qdoc
index 1f86ab5951..a501611d8c 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-terms.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-terms.qdoc
@@ -316,7 +316,7 @@
deploys it to the \l{glossary-device}{device} specified in the
selected \l{glossary-buildandrun-kit}{kit}, and runs it there. However,
if you have not made any changes to the project since you last deployed
- it, \QC simply runs it again.
+ it, \QDS simply runs it again.
\endomit
*/
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-optimized-3d-scenes.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-optimized-3d-scenes.qdoc
index d51feb8a38..8f1d1367e8 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-optimized-3d-scenes.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-optimized-3d-scenes.qdoc
@@ -34,7 +34,7 @@
\title Creating Optimized 3D Scenes
- In \QC, you can use various means to create a 3D scene. Your choice of
+ In \QDS, you can use various means to create a 3D scene. Your choice of
strategy should always depend on the target platform of your scene.
The way the content of your scene is authored can have dramatic effects on
the runtime performance of your UI. The Optimal 3D Scene described
@@ -110,7 +110,7 @@
The scene graph is the hierarchy of nodes that describe the scene to be
rendered.
- In \QC, the scene graph is represented by the tree-like view in
+ In \QDS, the scene graph is represented by the tree-like view in
\uicontrol Navigator. You can also view the hierarchy of nodes in the
\l {Code} view. By minimizing the size of the scene graph,
you can minimize the effort needed when running the scene. In terms of
diff --git a/doc/qtdesignstudio/src/views/qtquick-navigator.qdoc b/doc/qtdesignstudio/src/views/qtquick-navigator.qdoc
index 4b0845be5c..c2e40b729a 100644
--- a/doc/qtdesignstudio/src/views/qtquick-navigator.qdoc
+++ b/doc/qtdesignstudio/src/views/qtquick-navigator.qdoc
@@ -129,7 +129,7 @@
\section1 Locking Components
When designing complex applications, it is easy to accidentally modify
- the properties of a component in one of the \QC views in ways that lead to
+ the properties of a component in one of the \QDS views in ways that lead to
surprising results. For example, the \uicontrol {2D} view can become
crowded and other components can get in the way when you are trying to
select or transform a particular component, so that you end up transforming
@@ -137,7 +137,7 @@
To lock components that you are not currently editing and their children,
click \inlineimage icons/lockon.png
- in \uicontrol Navigator. Locked components cannot be handled in any \QC
+ in \uicontrol Navigator. Locked components cannot be handled in any \QDS
views. You can unlock the components when you want to edit them again.
\image qtquick-designer-navigator-lock.gif "Locking components in Navigator"
diff --git a/doc/qtdesignstudio/src/views/qtquick-properties.qdoc b/doc/qtdesignstudio/src/views/qtquick-properties.qdoc
index c7599ffa7d..a80201ea3a 100644
--- a/doc/qtdesignstudio/src/views/qtquick-properties.qdoc
+++ b/doc/qtdesignstudio/src/views/qtquick-properties.qdoc
@@ -51,7 +51,7 @@
another preset component in the field.
If you have specified values for properties that are not supported by the
- new component type, \QC offers to remove them for you. If you'd rather do
+ new component type, \QDS offers to remove them for you. If you'd rather do
this yourself, you can select the \inlineimage icons/action-icon.png
(\uicontrol Actions) menu next to the property name, and then select
\uicontrol Reset to remove the property values before trying again.
diff --git a/doc/qtdesignstudio/src/views/studio-workspaces.qdoc b/doc/qtdesignstudio/src/views/studio-workspaces.qdoc
index 444aca6b81..420b4b601a 100644
--- a/doc/qtdesignstudio/src/views/studio-workspaces.qdoc
+++ b/doc/qtdesignstudio/src/views/studio-workspaces.qdoc
@@ -30,7 +30,7 @@
\title Managing Workspaces
- In the \uicontrol Design mode, you can arrange a set of \QC
+ In the \uicontrol Design mode, you can arrange a set of \QDS
views as a \e workspace on the screen.
To detach views:
@@ -56,10 +56,10 @@
\section1 Saving Workspaces
- The changes you make to a workspace are saved when you exit \QC.
+ The changes you make to a workspace are saved when you exit \QDS.
Select \uicontrol View > \uicontrol Workspaces >
\uicontrol Manage > \uicontrol {Restore last workspace on startup}
- to restore the current workspace the next time you start \QC.
+ to restore the current workspace the next time you start \QDS.
\image qtcreator-workspace-manager.png "Workspace Manager"