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 /src/quick/doc/src/concepts | |
| 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 'src/quick/doc/src/concepts')
| -rw-r--r-- | src/quick/doc/src/concepts/effects/sprites.qdoc | 14 | ||||
| -rw-r--r-- | src/quick/doc/src/concepts/input/focus.qdoc | 2 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/quick/doc/src/concepts/effects/sprites.qdoc b/src/quick/doc/src/concepts/effects/sprites.qdoc index 2af463e4bf..edad89b1e5 100644 --- a/src/quick/doc/src/concepts/effects/sprites.qdoc +++ b/src/quick/doc/src/concepts/effects/sprites.qdoc @@ -144,14 +144,12 @@ to some graphics memory limitations. Because it requires all the sprites for a s texture, attempting to load many different animations can run into texture memory limits on embedded devices. In these situations, a warning will be output to the console containing the maximum texture size. -There are several software tools to help turn images into sprite sheets, here are some examples: -Photoshop plugin: -http://www.personal.psu.edu/zez1/blogs/my_blog/2011/05/scripts-4-photoshop-file-sequence-to-layers-to-sprite-sheet.html -Gimp plugin: -http://registry.gimp.org/node/20943 -Cmd-line tool: -http://www.imagemagick.org/script/montage.php - +There are several tools to help turn a set of images into sprite sheets, here are some examples: +\list + \li Photoshop plugin: \l http://www.johnwordsworth.com/projects/photoshop-sprite-sheet-generator-script + \li Gimp plugin: \l http://registry.gimp.org/node/20943 + \li Cmd-line tool: \l http://www.imagemagick.org/script/montage.php +\endlist \section2 QML Types Using the Sprite Engine diff --git a/src/quick/doc/src/concepts/input/focus.qdoc b/src/quick/doc/src/concepts/input/focus.qdoc index 90999d8b5e..db84961d20 100644 --- a/src/quick/doc/src/concepts/input/focus.qdoc +++ b/src/quick/doc/src/concepts/input/focus.qdoc @@ -138,7 +138,7 @@ similar to when there are no focus scopes. \li When a focus scope receives active focus, the contained type with \c focus set (if any) also gets the active focus. If this type is also a \l FocusScope, the proxying behavior continues. Both the -focus scope and the sub-focused item will have \c activeFocus property set. +focus scope and the sub-focused item will have the \c activeFocus property set. \endlist Note that, since the FocusScope type is not a visual type, the properties |