diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-24 17:36:04 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-24 17:36:04 +0100 |
| commit | ad67ec26d0cbc98e3440dd38bb20eef4da2ee96d (patch) | |
| tree | 9f8135751df2f995a4f55837ea065a4687245b71 /examples/quick | |
| parent | 83a16630c13969e68cd3a5aaab73335ccb0d4414 (diff) | |
| parent | 20d160d0513a04be187ed851a25b029f47c27b27 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
.qmake.conf
LICENSE.GPLv2
examples/qml/networkaccessmanagerfactory/view.qml
src/qml/jsruntime/qv4runtime.cpp
src/qml/jsruntime/qv4stringobject.cpp
Change-Id: I5d12f436d60995e51d5c2f59d364e9cbc24f8e32
Diffstat (limited to 'examples/quick')
| -rw-r--r-- | examples/quick/demos/maroon/doc/src/maroon.qdoc | 2 | ||||
| -rw-r--r-- | examples/quick/demos/photoviewer/doc/src/photoviewer.qdoc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/quick/demos/maroon/doc/src/maroon.qdoc b/examples/quick/demos/maroon/doc/src/maroon.qdoc index fcbe2923c1..3e38f8cfca 100644 --- a/examples/quick/demos/maroon/doc/src/maroon.qdoc +++ b/examples/quick/demos/maroon/doc/src/maroon.qdoc @@ -257,7 +257,7 @@ appear at the bottom of the new game screen and game canvas and slowly float towards the top on varying trajectories. - To use the ParticleSystem type, we must import \l{Qt Quick Particles}: + To use the ParticleSystem type, we must import \l{Qt Quick Particles QML Types}: \quotefromfile demos/maroon/maroon.qml \skipto Particles diff --git a/examples/quick/demos/photoviewer/doc/src/photoviewer.qdoc b/examples/quick/demos/photoviewer/doc/src/photoviewer.qdoc index 4da23f9b67..9c0f8b337e 100644 --- a/examples/quick/demos/photoviewer/doc/src/photoviewer.qdoc +++ b/examples/quick/demos/photoviewer/doc/src/photoviewer.qdoc @@ -306,10 +306,10 @@ \printuntil } \printuntil } - We use the \l qsTr() command to mark the button labels translatable. + We use the \l[QML]{Qt::}{qsTr()} command to mark the button labels translatable. - We use the \l lupdate tool to generate the translation source files and - the \l lrelease tool to convert the translated strings to the QM files used + We use the \c lupdate() tool to generate the translation source files and + the \c lrelease() tool to convert the translated strings to the QM files used by the application at runtime. These files are stored in the \c i18n directory. |