diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-27 03:02:07 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-10-29 13:31:55 +0000 |
commit | 4dd9e8b500cddf7cb7d929cfb91a33acb5572831 (patch) | |
tree | 64a8f6b2d2f577dd8d7bb7d0a9044d1f5c8e77bf /doc/src/howtos | |
parent | 318035f0265a5331524540fc6f5ddaa8f5195c8a (diff) | |
parent | c6e73db4f577f2076e6ad4b542f7dab08b744659 (diff) | |
download | qtdoc-4dd9e8b500cddf7cb7d929cfb91a33acb5572831.tar.gz |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
doc/src/platforms/supported-platforms.qdoc
Change-Id: I1ee9f0539524c51206cd6067ce446e11fa49416f
Diffstat (limited to 'doc/src/howtos')
-rw-r--r-- | doc/src/howtos/appicon.qdoc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/src/howtos/appicon.qdoc b/doc/src/howtos/appicon.qdoc index 11529353..fcd2487a 100644 --- a/doc/src/howtos/appicon.qdoc +++ b/doc/src/howtos/appicon.qdoc @@ -52,6 +52,14 @@ to load your application into Visual C++; here we are only using the icon editor.) + Alternatively, an \c .ico file can be created from a set of images using + ImageMagick's \l {https://imagemagick.org/script/convert.php}{convert} + tool: + + \badcode + magick.exe convert icon-16.png icon-32.png icon-256.png icon.ico + \endcode + Store the ICO file in your application's source code directory, for example, with the name \c myappico.ico. |