summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Buhr <andreas@andreasbuhr.de>2020-12-04 15:57:08 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-12-04 20:41:10 +0000
commitedfc1848cc5cad7961bfb7667150320a34ed0b60 (patch)
treef3ea86760b1322758fc7707be6682bd7a193074a
parent5b7fd9e4e4f11a90d4f3b75c1b70884c9aca8254 (diff)
Fix broken link to Zstandard library
The old link zstd.net is not working any more. Zstandard is now at http://facebook.github.io/zstd/. To ease maintenance in the future, those links now point to "Zstandard Site" which is maintained in external-resources.qdoc. Task-number: QTBUG-88533 Change-Id: Ic8f067fd5d7ce1a088d0272797fca98fd506a26e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 987ee226908fd502589181a30e16e34511bef131) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--doc/global/externalsites/external-resources.qdoc5
-rw-r--r--src/corelib/doc/src/resource-system.qdoc2
-rw-r--r--src/corelib/io/qresource.cpp2
3 files changed, 7 insertions, 2 deletions
diff --git a/doc/global/externalsites/external-resources.qdoc b/doc/global/externalsites/external-resources.qdoc
index f4f88d4673..a1ed9b57ef 100644
--- a/doc/global/externalsites/external-resources.qdoc
+++ b/doc/global/externalsites/external-resources.qdoc
@@ -527,3 +527,8 @@
\externalpage https://login.qt.io/
\title Qt Account Sign-up
*/
+
+/*!
+ \externalpage http://facebook.github.io/zstd/
+ \title Zstandard Site
+/
diff --git a/src/corelib/doc/src/resource-system.qdoc b/src/corelib/doc/src/resource-system.qdoc
index 9b80c31b00..6e0b2fd1ae 100644
--- a/src/corelib/doc/src/resource-system.qdoc
+++ b/src/corelib/doc/src/resource-system.qdoc
@@ -215,7 +215,7 @@
XML file to indicate a file should be most compressed, regardless of
which algorithms \c rcc supports.
- \li \c{zstd}: use the \l{https://zstd.net}{Zstandard} library to compress
+ \li \c{zstd}: use the \l{Zstandard Site}{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}
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp
index a5995df211..be3f80f73a 100644
--- a/src/corelib/io/qresource.cpp
+++ b/src/corelib/io/qresource.cpp
@@ -284,7 +284,7 @@ static inline QStringList *resourceSearchPaths()
\value NoCompression Contents are not compressed
\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{https://zstd.net}{zstd}. To
+ \value ZstdCompression Contents are compressed using \l{Zstandard Site}{zstd}. To
decompress, use the \c{ZSTD_decompress} function from the zstd
library.