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

Doc: replace "element" with "QML type" or "item"

Browse Source 
Try to make terminology more consistent, by using
"QML type" when describing the types, "item" when
describing instances of QML types, and "component"
when describing objects built by using QML types.

Change-Id: Ie03f3a7e6f483471e344ae1f35bec0742173b27c
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Leena Miettinen
2013-03-13 11:39:36 +01:00
parent 8c97b21e2a
commit dd4bd99c89
18 changed files with 207 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,9 +112,9 @@
Qt 4.6.x
\endif
\li Qt Quick Application (Built-in Elements)
\li Qt Quick Application (Built-in Types)
Use built-in QML elements to design user interfaces based on
Use built-in QML types to design user interfaces based on
Qt Quick 1 (Qt 4.7.1, or later) or Qt Quick 2 (Qt 5) with a
custom look and feel and QML and C++ code to implement the
application logic
@@ -279,7 +279,7 @@
\li Qt resource files, which allow you to store binary files in the
application executable
\li QML files, which specify elements in Qt Quick projects.
\li QML files, which specify items in Qt Quick projects.
\gui {Qt Quick 1} creates a QML file that imports Qt Quick 1.1 and
\gui {Qt Quick 2} creates a QML file that imports Qt Quick 2.0.
Select \gui {Qt Quick 1} to add files to a Qt Quick 1 application