Doc: Remove descriptions of Qt Quick Controls 1

Support for the Qt Quick Controls 1 has been removed.

Change-Id: I6fc64cea94ee64cabb19935124bb9e8fdc3d1089
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Leena Miettinen
2016-12-05 16:28:41 +01:00
parent 4d8d0f01d8
commit 73e4859c00
7 changed files with 11 additions and 20 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View File

@@ -117,13 +117,11 @@
You can build the application and deploy it to desktop, You can build the application and deploy it to desktop,
embedded, and mobile target platforms. embedded, and mobile target platforms.
\li Qt Quick Controls Application \li Qt Quick Controls 2 Application
Create a Qt Quick application using Create a Qt Quick application using
\l{http://doc.qt.io/qt-5/qtquickcontrols2-index.html} \l{http://doc.qt.io/qt-5/qtquickcontrols2-index.html}
{Qt Quick Controls 2} (requires Qt 5.7 or later) or {Qt Quick Controls 2} (requires Qt 5.7 or later)
\l{http://doc.qt.io/qt-5/qtquickcontrols-index.html}
{Qt Quick Controls}.
\li Qt Canvas 3D Application \li Qt Canvas 3D Application
@@ -181,10 +179,6 @@
review Qt Quick UI projects in a \l{Previewing QML Files} review Qt Quick UI projects in a \l{Previewing QML Files}
{preview tool} and you need not build them. {preview tool} and you need not build them.
\li Qt Quick Controls UI
Like a Qt Quick UI project, but using Qt Quick Controls
\li Qt Custom Designer Widgets \li Qt Custom Designer Widgets
Custom \QD widget or widget collection Custom \QD widget or widget collection

View File

@@ -765,14 +765,14 @@
\code \code
{ {
"name": "LabelQQC_1_0", "name": "LabelQQC_2_0",
"type": "Label", "type": "Label",
"span": true, "span": true,
"visible": "%{( '%{CS}' === 'QQC_1_0' ) ? 'yes' : ''}", "visible": "%{( '%{CS}' === 'QQC_2_0' )}",
"data": "data":
{ {
"wordWrap": true, "wordWrap": true,
"trText": "Creates a deployable Qt Quick 2 application using Qt Quick Controls. Requires Qt 5.1 or newer." "trText": "Creates a deployable Qt Quick 2 application using Qt Quick Controls 2.",
} }
}, },
\endcode \endcode

View File

@@ -68,12 +68,12 @@
\li \l {Creating Components} \li \l {Creating Components}
You can use basic QML types to create your own components that you You can use basic QML types to create your own components that you
can combine with ready-made Qt Quick Controls and Layouts can combine with ready-made Qt Quick Controls 2 and Layouts
(available since Qt 5.1). (available since Qt 5.7).
\li \l {Creating Screens} \li \l {Creating Screens}
You can combine basic QML types with ready-made Qt Quick Controls, You can combine basic QML types with ready-made Qt Quick Controls 2,
Dialogs, and Layouts (available since Qt 5.1) to create screens. You Dialogs, and Layouts (available since Qt 5.7) to create screens. You
can use states and transitions to navigate between screens. can use states and transitions to navigate between screens.
\li \l {Browsing ISO 7000 Icons} \li \l {Browsing ISO 7000 Icons}

View File

@@ -68,9 +68,6 @@
\l{Previewing QML Files}{preview tool} and you need not build them. \l{Previewing QML Files}{preview tool} and you need not build them.
They do not contain any C++ code. They do not contain any C++ code.
\li \uicontrol {Qt Quick Controls UI} is like \uicontrol {Qt Quick UI},
but using Qt Quick Controls.
\li \uicontrol {Qt Quick Extension Plugins} (in the \uicontrol Library category) \li \uicontrol {Qt Quick Extension Plugins} (in the \uicontrol Library category)
create C++ plugins that make it possible to offer extensions that create C++ plugins that make it possible to offer extensions that
can be loaded dynamically into Qt Quick applications. Select can be loaded dynamically into Qt Quick applications. Select
@@ -86,7 +83,7 @@
\li Select \uicontrol File > \uicontrol {New File or Project} > \li Select \uicontrol File > \uicontrol {New File or Project} >
\uicontrol Application > \uicontrol {Qt Quick Application} or \uicontrol Application > \uicontrol {Qt Quick Application} or
\uicontrol {Qt Quick Controls Application} > \uicontrol Choose. \uicontrol {Qt Quick Controls 2 Application} > \uicontrol Choose.
\li For some Qt Quick applications, you must select the Qt version to \li For some Qt Quick applications, you must select the Qt version to
develop with in the \uicontrol {Minimal required Qt version} field. develop with in the \uicontrol {Minimal required Qt version} field.

View File

@@ -59,7 +59,7 @@
\li \uicontrol {Library} (2) displays the building blocks that you can use \li \uicontrol {Library} (2) displays the building blocks that you can use
to design applications: predefined QML types, your own QML to design applications: predefined QML types, your own QML
components, Qt Quick components or Qt Quick Controls that you components, Qt Quick components or Qt Quick Controls 2 that you
import to the project, and other resources. import to the project, and other resources.
\li \uicontrol Connections (3) enables you to create connections between \li \uicontrol Connections (3) enables you to create connections between