diff --git a/doc/images/qmldesigner-new-project.png b/doc/images/qmldesigner-new-project.png index 57c53d8bd4a..59e17f24499 100644 Binary files a/doc/images/qmldesigner-new-project.png and b/doc/images/qmldesigner-new-project.png differ diff --git a/doc/images/qtcreator-new-qt-quick-project-wizard.png b/doc/images/qtcreator-new-qt-quick-project-wizard.png index eb9a5049ba9..35aebe6a168 100644 Binary files a/doc/images/qtcreator-new-qt-quick-project-wizard.png and b/doc/images/qtcreator-new-qt-quick-project-wizard.png differ diff --git a/doc/src/projects/creator-projects-creating.qdoc b/doc/src/projects/creator-projects-creating.qdoc index 809d2614c4d..8875e5f4b91 100644 --- a/doc/src/projects/creator-projects-creating.qdoc +++ b/doc/src/projects/creator-projects-creating.qdoc @@ -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 diff --git a/doc/src/projects/creator-projects-custom-wizards-json.qdoc b/doc/src/projects/creator-projects-custom-wizards-json.qdoc index ea75906386c..66cae4aa09a 100644 --- a/doc/src/projects/creator-projects-custom-wizards-json.qdoc +++ b/doc/src/projects/creator-projects-custom-wizards-json.qdoc @@ -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 diff --git a/doc/src/qtquick/qtquick-app-development.qdoc b/doc/src/qtquick/qtquick-app-development.qdoc index 5004f8b7e0e..fba39e121b3 100644 --- a/doc/src/qtquick/qtquick-app-development.qdoc +++ b/doc/src/qtquick/qtquick-app-development.qdoc @@ -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} diff --git a/doc/src/qtquick/qtquick-creating.qdoc b/doc/src/qtquick/qtquick-creating.qdoc index 0cd1984f271..8a4d10a603c 100644 --- a/doc/src/qtquick/qtquick-creating.qdoc +++ b/doc/src/qtquick/qtquick-creating.qdoc @@ -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. diff --git a/doc/src/qtquick/qtquick-designer.qdoc b/doc/src/qtquick/qtquick-designer.qdoc index 90e68de11e7..ac71be09113 100644 --- a/doc/src/qtquick/qtquick-designer.qdoc +++ b/doc/src/qtquick/qtquick-designer.qdoc @@ -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