feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Doc: Replace "Qt Quick Controls 2" with "Qt Quick Controls"

Browse Source 
- Qt Quick Controls 1 has been removed and most link targets have
  been changed
- Leave some link targets where links would break
- Leave strings that still have the "2" in Qt Creator
- Remove the obsolete dependency (QDoc complained about it)

Change-Id: I05148df3b07b4499f802557252c028b11ca29213
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Leena Miettinen
2019-04-08 16:56:13 +02:00
parent 0abcbac913
commit aacac48908
13 changed files with 54 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/config/qtcreator-project.qdocconf
View File

@@ -39,7 +39,6 @@ depends += qtwidgets \
qtgui \
qthelp \
qtquickcontrols \
qtquickcontrols2 \
qtquickextras \
qtlinguist \
qtscxml \

4
doc/src/overview/creator-only/creator-tutorials.qdoc
View File

@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2018 The Qt Company Ltd.
** Copyright (C) 2019 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Creator documentation.
@@ -55,7 +55,7 @@
\li \l{Creating a Mobile Application}
Learn how to create a Qt Quick application using Qt Quick Controls 2
Learn how to create a Qt Quick application using Qt Quick Controls
for Android and iOS devices.
\endlist

2
doc/src/projects/creator-only/creator-projects-creating.qdoc
View File

@@ -118,7 +118,7 @@
Create a Qt Quick application that uses
\l{http://doc.qt.io/qt-5/qtquickcontrols2-index.html}
{Qt Quick Controls 2} to implement a scrollable list (requires
{Qt Quick Controls} to implement a scrollable list (requires
Qt 5.9 or later) or a set of pages with a stack-based or
swipe-based navigation model (requires Qt 5.7 or later).

4
doc/src/projects/creator-only/creator-projects-custom-wizards-json.qdoc
View File

@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2018 The Qt Company Ltd.
** Copyright (C) 2019 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Creator documentation.
@@ -792,7 +792,7 @@
"data":
{
"wordWrap": true,
"trText": "Creates a deployable Qt Quick 2 application using Qt Quick Controls 2.",
"trText": "Creates a deployable Qt Quick 2 application using Qt Quick Controls.",
}
},
\endcode

4
doc/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc
View File

@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2018 The Qt Company Ltd.
** Copyright (C) 2019 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Creator documentation.
@@ -38,7 +38,7 @@
\title Creating a Mobile Application
This tutorial describes developing Qt Quick applications for Android and iOS
devices using Qt Quick Controls 2.
devices using Qt Quick Controls.
We use \QC to implement a Qt Quick application
that accelerates an SVG (Scalable Vector Graphics) image based on the
changing accelerometer values.

4
doc/src/qtquick/creator-only/creator-tutorial-create-qq-project.qdocinc
View File

@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
** Copyright (C) 2019 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Creator documentation.
@@ -44,7 +44,7 @@
use for building and running the project: \l qmake,
\l {Setting Up CMake}{CMake}, or \l {Setting Up Qbs}{Qbs}.
\li In the \uicontrol {Qt Quick Controls 2 Style} field, select one of
\li In the \uicontrol {Qt Quick Controls Style} field, select one of
the predefined \l{Styling Qt Quick Controls 2}{UI styles} to use,
and then select \uicontrol Next.

2
doc/src/qtquick/creator-only/qtquick-app-development.qdoc
View File

@@ -59,7 +59,7 @@
\li \l {Creating Components}
You can use basic QML types to create your own components that you
can combine with ready-made Qt Quick Controls 2 and Layouts
can combine with ready-made Qt Quick Controls and Layouts
(available since Qt 5.7).
\li \l {Managing Item Hierarchy}

5
doc/src/qtquick/creator-only/qtquick-app-tutorial.qdoc
View File

@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2018 The Qt Company Ltd.
** Copyright (C) 2019 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Creator documentation.
@@ -51,8 +51,7 @@
For more information about developing Qt Quick applications in the Design
mode, see \l{Developing Qt Quick Applications}.
For examples of using Qt Quick Controls 2, see
\l{Qt Quick Controls 2 Examples}.
For examples of using Qt Quick Controls, see \l{Qt Quick Controls Examples}.
\include creator-tutorial-create-qq-project.qdocinc qt quick application

6
doc/src/qtquick/creator-only/qtquick-creating.qdoc
View File

@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2018 The Qt Company Ltd.
** Copyright (C) 2019 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Creator documentation.
@@ -136,7 +136,7 @@
\QC generates a QML file, \e main.qml, that you can modify in the Design
mode.
\section1 Creating Qt Quick Controls 2 Applications
\section1 Creating Qt Quick Controls Applications
\list 1
@@ -155,7 +155,7 @@
use for building and running the project: \l qmake,
\l {Setting Up CMake}{CMake}, or \l {Setting Up Qbs}{Qbs}.
\li In the \uicontrol {Qt Quick Controls 2 Style} field, select one of
\li In the \uicontrol {Qt Quick Controls Style} field, select one of
the predefined \l{Styling Qt Quick Controls 2}{UI styles} to use,
and then select \uicontrol Next.

2
doc/src/qtquick/creator-only/qtquick-modules-with-plugins.qdoc
View File

@@ -179,6 +179,6 @@
qmlDesignerImportPaths in your product (for Qbs projects).
Modules in the import paths defined in \c{QML_DESIGNER_IMPORT_PATH} will be
used only in the Design mode.
For an example, see \l {Qt Quick Controls 2 - Contact List}.
For an example, see \l {Qt Quick Controls - Contact List}.
*/

72
doc/src/qtquick/qtquick-components.qdoc
View File

@@ -119,13 +119,13 @@
\li \l{GridView}{Grid View} provides a grid vizualization of a model.
\li \l{ListView}{List View} provides a list vizualization of a model.
\li \l{PathView}{Path View} visualizes the contents of a model along a
path.
\li \l [QtQuickControls2] {ScrollView}{Scroll View} provides scrolling
path. For more information, see \l{Editing PathView Properties}.
\li \l [QtQuickControls] {ScrollView}{Scroll View} provides scrolling
for user-defined content. It can be used instead of a \l Flickable
item.
\li \l [QtQuickControls2] {StackView}{Stack View} provides a stack-based
\li \l [QtQuickControls] {StackView}{Stack View} provides a stack-based
navigation model.
\li \l[QtQuickControls2] {SwipeView}{Swipe View} enables users to
\li \l[QtQuickControls] {SwipeView}{Swipe View} enables users to
navigate pages by swiping sideways.
\endlist
@@ -333,21 +333,21 @@
\section2 Organizing Items
Since Qt 5.7, you can use the following \l{Qt Quick Controls 2} types to
Since Qt 5.7, you can use the following \l{Qt Quick Controls} types to
organize items on screens:
\list
\li \l [QtQuickControls2]{Frame} places a logical group of controls
\li \l [QtQuickControls]{Frame} places a logical group of controls
within a visual frame.
\li \l [QtQuickControls2]{GroupBox}{Group Box} is used to lay out a
\li \l [QtQuickControls]{GroupBox}{Group Box} is used to lay out a
logical group of controls together, within a titled visual frame.
\li \l [QtQuickControls2]{Label} is a text label with inherited styling
\li \l [QtQuickControls]{Label} is a text label with inherited styling
and font.
\li \l [QtQuickControls2]{Page} provides a styled page control with
\li \l [QtQuickControls]{Page} provides a styled page control with
support for a header and footer.
\li \l [QtQuickControls2]{PageIndicator}{Page Indicator} indicates the
\li \l [QtQuickControls]{PageIndicator}{Page Indicator} indicates the
currently active page.
\li \l [QtQuickControls2]{Pane} provides a background matching with the
\li \l [QtQuickControls]{Pane} provides a background matching with the
application style and theme.
\endlist
@@ -365,62 +365,62 @@
\li \l [QML]{MouseArea}{Mouse Area} enables simple mouse handling.
\endlist
Since Qt 5.7, you can also use the following \l{Qt Quick Controls 2} types
Since Qt 5.7, you can also use the following \l{Qt Quick Controls} types
to inform users about the progress of the application or to gather input
from the user:
\list
\li \l [QtQuickControls2]{BusyIndicator}{Busy Indicator} indicates
\li \l [QtQuickControls]{BusyIndicator}{Busy Indicator} indicates
activity while content is being loaded.
\li \l [QtQuickControls2]{Button} provides a push button that you can
\li \l [QtQuickControls]{Button} provides a push button that you can
associate with an action.
\li \l [QtQuickControls2]{CheckBox}{Check Box} provides an option button
\li \l [QtQuickControls]{CheckBox}{Check Box} provides an option button
that can be toggled on (checked) or off (unchecked).
\li \l [QtQuickControls2]{CheckDelegate}{Check Delegate} presents an
\li \l [QtQuickControls]{CheckDelegate}{Check Delegate} presents an
item delegate that can be toggled on (checked) or off (unchecked).
\li \l [QtQuickControls2]{ComboBox}{Combo Box} is a combined button and
\li \l [QtQuickControls]{ComboBox}{Combo Box} is a combined button and
popup list that is populated by using a data model.
\li \l [QtQuickControls2]{DelayButton}{Delay Button} provides an option
\li \l [QtQuickControls]{DelayButton}{Delay Button} provides an option
button that is triggered when held down long enough.
\li \l [QtQuickControls2]{Dial} is a circular dial that is rotated to
\li \l [QtQuickControls]{Dial} is a circular dial that is rotated to
set a value.
\li \l [QtQuickControls2]{ProgressBar}{Progress Bar} indicates the
\li \l [QtQuickControls]{ProgressBar}{Progress Bar} indicates the
progress of an operation.
\li \l [QtQuickControls2]{RadioButton}{Radio Button} provides an option
\li \l [QtQuickControls]{RadioButton}{Radio Button} provides an option
button that can be switched on (checked) or off (unchecked).
\li \l [QtQuickControls2]{RadioDelegate}{Radio Delegate} presents an
\li \l [QtQuickControls]{RadioDelegate}{Radio Delegate} presents an
item delegate that can be toggled on (checked) or off (unchecked).
\li \l [QtQuickControls2]{RangeSlider}{Range Slider} enables users to
\li \l [QtQuickControls]{RangeSlider}{Range Slider} enables users to
select a range of values by sliding two handles along a track.
\li \l [QtQuickControls2]{RoundButton}{Round Button} provides a push
\li \l [QtQuickControls]{RoundButton}{Round Button} provides a push
button with rounded corners that you can associate with an action.
\li \l [QtQuickControls2]{Slider} selects a value by sliding a handle
\li \l [QtQuickControls]{Slider} selects a value by sliding a handle
along a track.
\li \l [QtQuickControls2]{SpinBox}{Spin Box} enables the user to specify
\li \l [QtQuickControls]{SpinBox}{Spin Box} enables the user to specify
a value by clicking the up or down buttons, by pressing up or down
on the keyboard, or by entering a value in the box.
\li \l [QtQuickControls2]{Switch} is an option button that can be
\li \l [QtQuickControls]{Switch} is an option button that can be
toggled on or off.
\li \l [QtQuickControls2]{SwitchDelegate}{SwitchDelegate} presents an
\li \l [QtQuickControls]{SwitchDelegate}{Switch Delegate} presents an
item delegate with a switch indicator that can be toggled on or off.
\li \l [QtQuickControls2] {TabBar}{Tab Bar} enables users to switch
\li \l [QtQuickControls] {TabBar}{Tab Bar} enables users to switch
between different views or subtasks.
\li \l [QtQuickControls2]{TabButton}{Tab Button} is a button
\li \l [QtQuickControls]{TabButton}{Tab Button} is a button
that is functionally similar to \uicontrol Button, but provides a
look that is more suitable for a \uicontrol {Tab Bar}.
\li \l [QtQuickControls2]{TextArea}{Text Area} displays multiple lines
\li \l [QtQuickControls]{TextArea}{Text Area} displays multiple lines
of editable formatted text.
\li \l [QtQuickControls2]{TextField}{Text Field} displays a single line
\li \l [QtQuickControls]{TextField}{Text Field} displays a single line
of editable plain text.
\li \l [QtQuickControls2]{ToolBar}{Tool Bar} is a container of
\li \l [QtQuickControls]{ToolBar}{Tool Bar} is a container of
application-wide and context sensitive actions and controls, such as
navigation buttons and search fields.
\li \l [QtQuickControls2]{ToolButton}{Tool Button} is a button
\li \l [QtQuickControls]{ToolButton}{Tool Button} is a button
that is functionally similar to \uicontrol Button, but provides a
look that is more suitable for a \uicontrol {Tool Bar}.
\li \l [QtQuickControls2]{ToolSeparator}{Tool Separator} separates a
\li \l [QtQuickControls]{ToolSeparator}{Tool Separator} separates a
group of items from adjacent items on a \uicontrol {Tool Bar}.
\li \l [QtQuickControls2]{Tumbler} is a spinnable wheel of items that
\li \l [QtQuickControls]{Tumbler} is a spinnable wheel of items that
can be selected.
\endlist

2
doc/src/qtquick/qtquick-designer.qdoc
View File

@@ -73,7 +73,7 @@
\li \uicontrol {Library} (2) displays the building blocks that you
can use to design applications: predefined QML types, your own
QML components, or Qt Quick Controls 2 that you import to the
QML components, or Qt Quick Controls that you import to the
project, and other resources. For more information, see
\l {Creating Components}.

2
doc/src/qtquick/qtquick-navigator.qdoc
View File

@@ -95,7 +95,7 @@
\uicontrol {Stack (z)}. To remove the \c z property, select
\uicontrol {Reset z Property}.
You can also use a \uicontrol StackLayout item (Qt Quick Controls 2) to
You can also use a \uicontrol StackLayout item (Qt Quick Controls) to
create a stacked view. For more information, see \l {Using Layouts}.
\section1 Switching Parent Items