diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-12 01:01:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-07-12 15:56:39 +0200 |
| commit | d389fe039203f318a8c9a836dea4c348a1a892a8 (patch) | |
| tree | 223f8c3c6869818c43a139040bcd3862f0393095 /src/quick/doc | |
| parent | de0d91abbbcf58a66018a08ca77bb4d63a5efda1 (diff) | |
| parent | 47ad6c57d1873c3da362cfad7cc81dc0aa2720a4 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/qml/qml/qqmltypeloader.cpp
src/quick/scenegraph/qsgopengldistancefieldglyphcache.cpp
Change-Id: I1a226d8738db2ec06e3cef240a0e040e7c144cad
Diffstat (limited to 'src/quick/doc')
| -rw-r--r-- | src/quick/doc/qtquick.qdocconf | 1 | ||||
| -rw-r--r-- | src/quick/doc/src/concepts/effects/sprites.qdoc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf index 6620650d4a..13746b13de 100644 --- a/src/quick/doc/qtquick.qdocconf +++ b/src/quick/doc/qtquick.qdocconf @@ -1,4 +1,5 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) +include($QT_INSTALL_DOCS/config/exampleurl-qtdeclarative.qdocconf) project = QtQuick description = Qt Quick Reference Documentation diff --git a/src/quick/doc/src/concepts/effects/sprites.qdoc b/src/quick/doc/src/concepts/effects/sprites.qdoc index 004db90eb3..159d9ca8a9 100644 --- a/src/quick/doc/src/concepts/effects/sprites.qdoc +++ b/src/quick/doc/src/concepts/effects/sprites.qdoc @@ -144,7 +144,7 @@ these situations, a warning will be output to the console containing the maximum 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 Gimp's SpriteSheet plugin \li Cmd-line tool: \l http://www.imagemagick.org/script/montage.php \endlist |