summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2022-02-23 09:52:39 +0100
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2022-02-23 11:56:50 +0000
commit6e366c0823f0ff40273614cd905b58c2729d93ab (patch)
tree40ece0b0b7b3df5a30a1f85c6744d6a8941d9b43
parentcf902649713ed2fd584e5aca89328c4f99ca0223 (diff)
downloadqt-creator-6e366c0823f0ff40273614cd905b58c2729d93ab.tar.gz
Doc: Replace "New File or Project" with "New Project" or "New File"
We missed the .qdocinc files. Update the screenshot. Task-number: QTCREATORBUG-26610 Change-Id: Ic5a86c94e995a209c2139976ed645b7f71556b37 Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r--doc/qtcreator/images/qtcreator-custom-wizard.pngbin17411 -> 12621 bytes
-rw-r--r--doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards-json.qdocinc26
-rw-r--r--doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards.qdoc6
-rw-r--r--doc/qtcreator/src/qtquick/creator-only/qtquick-tutorial-create-empty-project.qdocinc4
-rw-r--r--doc/qtdesignstudio/src/qtdesignstudio-components.qdocinc4
5 files changed, 20 insertions, 20 deletions
diff --git a/doc/qtcreator/images/qtcreator-custom-wizard.png b/doc/qtcreator/images/qtcreator-custom-wizard.png
index 818380aac3..73d3b417b8 100644
--- a/doc/qtcreator/images/qtcreator-custom-wizard.png
+++ b/doc/qtcreator/images/qtcreator-custom-wizard.png
Binary files differ
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards-json.qdocinc b/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards-json.qdocinc
index 62ef588555..44fe1cc1f5 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards-json.qdocinc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards-json.qdocinc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2021 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Creator documentation.
@@ -114,7 +114,7 @@
\c {share/qtcreator/templates/wizards/classes/mycpp}
\li Use the \uicontrol {Factory.Reset} action to make the wizard appear
- in \uicontrol File > \uicontrol {New File or Project} without
+ in \uicontrol File > \uicontrol {New File} without
restarting \QC.
\li Open the wizard configuration file, \c {wizard.json} for editing:
@@ -122,7 +122,7 @@
\list
\li The following settings determine the type of the wizard and
- its place in the \uicontrol {New File or Project} dialog:
+ its place in the \uicontrol {New File} dialog:
\code
"version": 1,
@@ -163,14 +163,14 @@
\li \c category is the category in which to place the wizard
in the list. You can use a leading letter to specify the
position of the category in the list in the
- \uicontrol {New File or Project} dialog.
+ \uicontrol {New File} dialog.
This information is available in the wizard as
\c {%\{category\}}.
\endlist
\li The following settings specify the icon and text that appear in
- the \uicontrol {New File or Project} dialog:
+ the \uicontrol {New File} dialog:
\code
"trDescription": "Creates a C++ header and a source file for a new class that you can add to a C++ project.",
@@ -194,9 +194,8 @@
This information is available in the wizard as
\c {%\{trDisplayName\}}.
- \li \c trDisplayCategory appears in the
- \uicontrol {New File or Project} dialog, under
- \uicontrol Projects.
+ \li \c trDisplayCategory appears in the \uicontrol {New File}
+ dialog, under \uicontrol {Files and Classes}.
This information is available in the wizard as
\c {%\{trDisplayCategory\}}.
@@ -231,9 +230,9 @@
\c{false}.
\li \c enabled is evaluated to determine whether a wizard is
- listed in \uicontrol Files >
- \uicontrol {New File or Project}, after \c featuresRequired
- has been checked.
+ listed in \uicontrol File > \uicontrol {New Project} or
+ \uicontrol {New File}, after \c featuresRequired has been
+ checked.
The default value is \c true.
@@ -373,7 +372,8 @@
instance of \QC.
\li \c Platform contains the platform selected in the \uicontrol File >
- \uicontrol {New File or Project} dialog. This value may be empty.
+ \uicontrol {New Project} or \uicontrol {New File} dialog. This value
+ may be empty.
\endlist
The following information is only available when the wizard was triggered
@@ -487,7 +487,7 @@
\endcode
The page evaluates \c {%\{Platform\}} to set the platform selected in
- \uicontrol File > \uicontrol {New File or Project}.
+ \uicontrol File > \uicontrol {New Project} or \uicontrol {New File}.
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards.qdoc
index 0a4fc15402..c9f5cc6e5a 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Creator documentation.
@@ -59,8 +59,8 @@
wizard directory and instruct the recipients to extract it into one of the
directories \QC searches wizards from.
- \QC displays the wizards that it finds in the
- \uicontrol {New File} and \uicontrol {New Project} dialogs. For each wizard, an icon (1), a
+ \QC displays the wizards that it finds in the \uicontrol {New Project}
+ and \uicontrol {New File} dialogs. For each wizard, an icon (1), a
display name (2), and a description (3) are displayed.
\image qtcreator-custom-wizard.png
diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-tutorial-create-empty-project.qdocinc b/doc/qtcreator/src/qtquick/creator-only/qtquick-tutorial-create-empty-project.qdocinc
index 3eb7e5401f..4462b21813 100644
--- a/doc/qtcreator/src/qtquick/creator-only/qtquick-tutorial-create-empty-project.qdocinc
+++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-tutorial-create-empty-project.qdocinc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2021 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
\list 1
- \li Select \uicontrol File > \uicontrol {New File or Project} >
+ \li Select \uicontrol File > \uicontrol {New Project} >
\uicontrol {Application (Qt)} > \uicontrol {Qt Quick Application}.
\li Select \uicontrol Choose to open the
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-components.qdocinc b/doc/qtdesignstudio/src/qtdesignstudio-components.qdocinc
index e319a0042b..17701d3328 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-components.qdocinc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-components.qdocinc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2021 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Design Studio documentation.
@@ -61,7 +61,7 @@
To create stylable UI controls:
\list 1
- \li Select \uicontrol File > \uicontrol {New File or Project} >
+ \li Select \uicontrol File > \uicontrol {New File} >
\uicontrol {Files and Classes} > \uicontrol {Qt Quick Controls}.
\li Select the control to create, and then select \uicontrol Choose.