summaryrefslogtreecommitdiff
path: root/doc/src/qtquick
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2019-01-17 11:44:12 +0100
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2019-01-17 12:53:32 +0000
commit79e75a8fda8de5150408dd8e30099091200ae6bc (patch)
treefd067cf480cd3379462277ec7747f34e1c8b36cb /doc/src/qtquick
parente6fe1437956ffc8779b9c7569cba18f4b51e5784 (diff)
downloadqt-creator-79e75a8fda8de5150408dd8e30099091200ae6bc.tar.gz
Doc: Remove the word "prototype"
For reuse in Qt Design Studio, where the terms will be changed. Change-Id: Icbfec3759a3b677df2d166379404a58540d13012 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'doc/src/qtquick')
-rw-r--r--doc/src/qtquick/creator-only/qtquick-app-development.qdoc10
-rw-r--r--doc/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc14
2 files changed, 12 insertions, 12 deletions
diff --git a/doc/src/qtquick/creator-only/qtquick-app-development.qdoc b/doc/src/qtquick/creator-only/qtquick-app-development.qdoc
index f9b255edf7..d026049d0d 100644
--- a/doc/src/qtquick/creator-only/qtquick-app-development.qdoc
+++ b/doc/src/qtquick/creator-only/qtquick-app-development.qdoc
@@ -105,12 +105,12 @@
details of the contained components, and therefore, the modules must
provide extra type information for code completion and the semantic
checks to work correctly.
- \li \l {Converting Qt Quick UI Prototypes to Applications}
+ \li \l {Converting UI Projects to Applications}
- Qt Quick UI projects are useful for prototyping user interfaces. To
- use them for application development, you have to convert them to
- Qt Quick Application projects that contain .pro, .cpp, and .qrc
- files.
+ Qt Quick UI projects (.qmlproject) are useful for creating user
+ interfaces. To use them for application development, you have to
+ convert them to Qt Quick Application projects that contain .pro,
+ .cpp, and .qrc files.
\endlist
diff --git a/doc/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc b/doc/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc
index 64eb3dfe4f..174b6c3c93 100644
--- a/doc/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc
+++ b/doc/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc
@@ -34,9 +34,9 @@
\nextpage creator-using-qt-designer.html
\endif
- \title Converting Qt Quick UI Prototypes to Applications
+ \title Converting UI Projects to Applications
- Qt Quick UI projects are useful for prototyping user interfaces. To
+ Qt Quick UI projects are useful for creating user interfaces. To
use them for application development in Qt Creator you have to add:
\list
@@ -49,7 +49,7 @@
You can use a Qt Creator wizard to create a Qt Quick application that is
built using the qmake build system and then copy the source files from the
- Qt UI Quick prototype project to the application project.
+ Qt UI Quick project to the application project.
You can use the \c RESOURCES option in the project configuration file to
automatically add all the QML files and related assets to a Qt resource
@@ -71,8 +71,8 @@
\section1 Converting Projects
- To convert a Qt Quick UI prototype project that has a .qmlproject file to
- a Qt Quick application that has a .pro file:
+ To convert a project that has a .qmlproject file to one that has a .pro
+ file:
\list 1
\li Select \uicontrol File > \uicontrol {New File or Project} >
@@ -83,7 +83,7 @@
\uicontrol Next (or \uicontrol Continue on \macos).
\li Follow the instructions of the wizard to create the project.
\li In the file explorer, copy the source files from the Qt Quick UI
- prototype project directory to a subdirectory in the application
+ project directory to a subdirectory in the application
project directory. For the purpose of these instructions, the
directory is called \c qml.
\li Open the application project file, and edit the value of the
@@ -100,7 +100,7 @@
\skipto QQuickView view;
\printuntil view.show()
Where \c {qml\main.qml} is the path to and the name of the main QML
- file in the Qt Quick UI prototype project.
+ file in the Qt Quick UI project.
\li Select \uicontrol Build > \uicontrol Run to build and run your
project.
\endlist