diff --git a/doc/qtcreator/images/qmldesigner-new-project.png b/doc/qtcreator/images/qmldesigner-new-project.png index 3b6db25610c..8554f7af892 100644 Binary files a/doc/qtcreator/images/qmldesigner-new-project.png and b/doc/qtcreator/images/qmldesigner-new-project.png differ diff --git a/doc/qtcreator/src/android/androiddev.qdoc b/doc/qtcreator/src/android/androiddev.qdoc index d03ea73b2c7..e2095df83c3 100644 --- a/doc/qtcreator/src/android/androiddev.qdoc +++ b/doc/qtcreator/src/android/androiddev.qdoc @@ -274,8 +274,9 @@ check box to allow \QC to create the kits for you. \QC displays a warning if it cannot find a suitable Qt version. - \li Select \uicontrol File > \uicontrol {New File or Project} > \uicontrol Application > - \uicontrol {Qt Quick Application} > \uicontrol Choose, and + \li Select \uicontrol File > \uicontrol {New File or Project} > + \uicontrol {Application (Qt Quick)} > + \uicontrol {Qt Quick Application - Empty} > \uicontrol Choose, and follow the instructions of the wizard to create a project. For more information, see \if defined(qtcreator) diff --git a/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc b/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc index c59259638de..dd0ab2f4387 100644 --- a/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc +++ b/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc @@ -176,8 +176,8 @@ \list 1 \li Select \uicontrol File > \uicontrol {New File or Project} > - \uicontrol Application > \uicontrol {MCU Support Application} > - \uicontrol Choose. + \uicontrol {Application (Qt Quick)} > + \uicontrol {MCU Support Application} > \uicontrol Choose. \li Follow the instructions of the wizard to create the project. \li Select \uicontrol Projects > \uicontrol {Build & Run}, and then select the kit for building the application and running it on the diff --git a/doc/qtcreator/src/qtquick/creator-only/creator-tutorial-create-qq-project.qdocinc b/doc/qtcreator/src/qtquick/creator-only/creator-tutorial-create-qq-project.qdocinc index 04826f69fac..010d4c863f0 100644 --- a/doc/qtcreator/src/qtquick/creator-only/creator-tutorial-create-qq-project.qdocinc +++ b/doc/qtcreator/src/qtquick/creator-only/creator-tutorial-create-qq-project.qdocinc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -31,8 +31,8 @@ \list 1 \li Select \uicontrol File > \uicontrol {New File or Project} > - \uicontrol Application > \uicontrol {Qt Quick Application - Swipe} > - \uicontrol Choose. + \uicontrol {Application (Qt Quick)} > + \uicontrol {Qt Quick Application - Swipe} > \uicontrol Choose. \li In the \uicontrol Name field, enter a name for the application. diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc index 1cde5d74197..5212f6bdb08 100644 --- a/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc +++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc @@ -44,33 +44,39 @@ options: \list + \li \uicontrol {Application (Qt Quick)}: - \li \uicontrol {Qt Quick Application - Empty} creates a Qt Quick 2 - application project that can contain both QML and C++ code. You can - build the application and deploy it to desktop, embedded, and mobile - target platforms. + \list - \li \uicontrol {Qt for Python - Qt Quick Application - Empty} creates a + \li \uicontrol {Qt Quick Application - Empty} creates a Qt Quick 2 + application project that can contain both QML and C++ code. You can + build the application and deploy it to desktop, embedded, and mobile + target platforms. + + \li \uicontrol {Qt Quick Application - Scroll} uses the + \l{http://doc.qt.io/qt-5/qml-qtquick-controls2-scrollview.html} + {ScrollView} type to implement a scrollable list view + (requires Qt 5.9 or later). + + \li \uicontrol {Qt Quick Application - Stack} uses the + \l{http://doc.qt.io/qt-5/qml-qtquick-controls2-stackview.html} + {StackView} type to implement a set of pages with a stack-based + navigation model (requires Qt 5.7 or later). + + \li \uicontrol {Qt Quick Application - Swipe} uses the + \l{http://doc.qt.io/qt-5/qml-qtquick-controls2-swipeview.html} + {SwipeWiew} type to implement a set of pages with a swipe-based + navigation model (requires Qt 5.7 or later). + + \endlist + + \li \uicontrol {Application (Qt for Python)} > + \uicontrol {Qt for Python - Qt Quick Application - Empty} creates a Python project that contains an empty Qt Quick Application. - \li \uicontrol {Qt Quick Application - Scroll} uses the - \l{http://doc.qt.io/qt-5/qml-qtquick-controls2-scrollview.html} - {ScrollView} type to implement a scrollable list view - (requires Qt 5.9 or later). - - \li \uicontrol {Qt Quick Application - Stack} uses the - \l{http://doc.qt.io/qt-5/qml-qtquick-controls2-stackview.html} - {StackView} type to implement a set of pages with a stack-based - navigation model (requires Qt 5.7 or later). - - \li \uicontrol {Qt Quick Application - Swipe} uses the - \l{http://doc.qt.io/qt-5/qml-qtquick-controls2-swipeview.html} - {SwipeWiew} type to implement a set of pages with a swipe-based - navigation model (requires Qt 5.7 or later). - - \li \uicontrol {Qt Quick UI Prototype} (in the \uicontrol {Other Project} - category) creates a \l{Creating Qt Quick UI Projects} - {Qt Quick UI project} with a single QML file that + \li \uicontrol {Other Project} > \uicontrol {Qt Quick UI Prototype} + creates a \l{Creating Qt Quick UI Projects}{Qt Quick UI project} + with a single QML file that contains the main view. You can review Qt Quick 2 UI projects in the \l{Previewing QML Files}{QML Scene preview tool}. You do not need to build them, because they do not contain any C++ code. @@ -81,8 +87,8 @@ target platforms. For those platforms, create a Qt Quick application instead. - \li \uicontrol {Qt Quick 2 Extension Plugin} (in the \uicontrol Library category) - create C++ plugins that make it possible to offer extensions that + \li \uicontrol Library > \uicontrol {Qt Quick 2 Extension Plugin} + creates C++ plugins that make it possible to offer extensions that can be loaded dynamically into Qt Quick 2 applications. \endlist @@ -99,8 +105,8 @@ \list 1 \li Select \uicontrol File > \uicontrol {New File or Project} > - \uicontrol Application > \uicontrol {Qt Quick Application - Empty} > - \uicontrol Choose. + \uicontrol {Application (Qt Quick)} > + \uicontrol {Qt Quick Application - Empty} > \uicontrol Choose. \li In the \uicontrol Name field, enter a name for the application. @@ -162,7 +168,8 @@ \list 1 \li Select \uicontrol File > \uicontrol {New File or Project} > - \uicontrol Application > \uicontrol {Qt Quick Application - Scroll}, + \uicontrol {Application (Qt Quick)} > + \uicontrol {Qt Quick Application - Scroll}, \uicontrol {Qt Quick Application - Stack}, or \uicontrol {Qt Quick Application - Swipe} > \uicontrol Choose. diff --git a/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc b/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc index 898dd92569f..1150e1339dc 100644 --- a/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc @@ -76,8 +76,8 @@ \list 1 \li Select \uicontrol File > \uicontrol {New File or Project} > - \uicontrol Application > \uicontrol {Qt Quick Application - Empty} > - \uicontrol Choose. + \uicontrol {Application (Qt Quick)} > + \uicontrol {Qt Quick Application - Empty} > \uicontrol Choose. \li In the \uicontrol {Build system} field, select \l qmake as the build system to use for building and running the project, and then select \uicontrol Next (or \uicontrol Continue on \macos).