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

Doc: Remove descriptions of Qt Quick Controls 1

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

BIN
doc/images/qmldesigner-new-project.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 18 KiB

BIN
doc/images/qtcreator-new-qt-quick-project-wizard.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 18 KiB

10
doc/src/projects/creator-projects-creating.qdoc
View File

@@ -117,13 +117,11 @@
You can build the application and deploy it to desktop,
embedded, and mobile target platforms.
\li Qt Quick Controls Application
\li Qt Quick Controls 2 Application
Create a Qt Quick application using
\l{http://doc.qt.io/qt-5/qtquickcontrols2-index.html}
{Qt Quick Controls 2} (requires Qt 5.7 or later) or
\l{http://doc.qt.io/qt-5/qtquickcontrols-index.html}
{Qt Quick Controls}.
{Qt Quick Controls 2} (requires Qt 5.7 or later)
\li Qt Canvas 3D Application
@@ -181,10 +179,6 @@
review Qt Quick UI projects in a \l{Previewing QML Files}
{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
Custom \QD widget or widget collection

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

@@ -765,14 +765,14 @@
\code
{
"name": "LabelQQC_1_0",
"name": "LabelQQC_2_0",
"type": "Label",
"span": true,
"visible": "%{( '%{CS}' === 'QQC_1_0' ) ? 'yes' : ''}",
"visible": "%{( '%{CS}' === 'QQC_2_0' )}",
"data":
{
"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

8
doc/src/qtquick/qtquick-app-development.qdoc
View File

@@ -68,12 +68,12 @@
\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 and Layouts
(available since Qt 5.1).
can combine with ready-made Qt Quick Controls 2 and Layouts
(available since Qt 5.7).
\li \l {Creating Screens}
You can combine basic QML types with ready-made Qt Quick Controls,
Dialogs, and Layouts (available since Qt 5.1) to create screens. You
You can combine basic QML types with ready-made Qt Quick Controls 2,
Dialogs, and Layouts (available since Qt 5.7) to create screens. You
can use states and transitions to navigate between screens.
\li \l {Browsing ISO 7000 Icons}

5
doc/src/qtquick/qtquick-creating.qdoc
View File

@@ -68,9 +68,6 @@
\l{Previewing QML Files}{preview tool} and you need not build them.
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)
create C++ plugins that make it possible to offer extensions that
can be loaded dynamically into Qt Quick applications. Select
@@ -86,7 +83,7 @@
\li Select \uicontrol File > \uicontrol {New File or Project} >
\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
develop with in the \uicontrol {Minimal required Qt version} field.

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

@@ -59,7 +59,7 @@
\li \uicontrol {Library} (2) displays the building blocks that you can use
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.
\li \uicontrol Connections (3) enables you to create connections between