diff options
author | Liang Qi <liang.qi@qt.io> | 2019-12-16 07:05:19 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-12-16 07:05:19 +0100 |
commit | ee71a9ba8169b9327b8dbaf2266ebeb515c64dbb (patch) | |
tree | a2eb41c9b1b47ac8cd6f22c289f7227569ee0a5a /src/corelib/doc/src/resource-system.qdoc | |
parent | d6266c757d2f2ea4ff1e71dc8545f9bf97aa3bb1 (diff) | |
parent | 98f19f00361bf25097281cae5dfa833ba7db8a2f (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/network/ssl/qsslsocket.cpp
src/widgets/kernel/qapplication.cpp
Change-Id: Ib7421cc2df59d0969f89b3fbd65a17ea76ffef3b
Diffstat (limited to 'src/corelib/doc/src/resource-system.qdoc')
-rw-r--r-- | src/corelib/doc/src/resource-system.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/doc/src/resource-system.qdoc b/src/corelib/doc/src/resource-system.qdoc index 69ec5e556b..f9ef317799 100644 --- a/src/corelib/doc/src/resource-system.qdoc +++ b/src/corelib/doc/src/resource-system.qdoc @@ -189,13 +189,13 @@ XML file to indicate a file should be most compressed, regardless of which algorithms \c rcc supports. - \li \c{zstd}: use the \l{Zstandard}{https://zstd.net} library to compress + \li \c{zstd}: use the \l{https://zstd.net}{Zstandard} library to compress contents. Valid compression levels range from 1 to 19, 1 is least compression (least CPU time) and 19 is the most compression (most CPU time). The default level is 14. A special value of 0 tells the \c{zstd} library to choose an implementation-defined default. - \li \c{zlib}: use the \l{zlib}{https://zlib.net} library to compress + \li \c{zlib}: use the \l{https://zlib.net}{zlib} library to compress contents. Valid compression levels range from 1 to 9, with 1the least compression (least CPU time) and 9 the most compression (most CPU time). The special value 0 means "no compression" and should not be used. The |