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/io/qresource.cpp | |
| 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/io/qresource.cpp')
| -rw-r--r-- | src/corelib/io/qresource.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp index 3664a63050..bb608d8a72 100644 --- a/src/corelib/io/qresource.cpp +++ b/src/corelib/io/qresource.cpp @@ -280,9 +280,9 @@ static inline QStringList *resourceSearchPaths() RCC tool used to compress the payload. \value NoCompression Contents are not compressed - \value ZlibCompression Contents are compressed using \l{zlib}{https://zlib.net} and can + \value ZlibCompression Contents are compressed using \l{https://zlib.net}{zlib} and can be decompressed using the qUncompress() function. - \value ZstdCompression Contents are compressed using \l{zstd}{https://zstd.net}. To + \value ZstdCompression Contents are compressed using \l{https://zstd.net}{zstd}. To decompress, use the \c{ZSTD_decompress} function from the zstd library. |