summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qbytearray.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/tools/qbytearray.cpp')
-rw-r--r--src/corelib/tools/qbytearray.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp
index cc81c1b..b281c1b 100644
--- a/src/corelib/tools/qbytearray.cpp
+++ b/src/corelib/tools/qbytearray.cpp
@@ -492,7 +492,7 @@ QByteArray qCompress(const uchar* data, int nbytes, int compressionLevel)
#endif
/*!
- \fn QByteArray qUncompress(const QByteArray& data)
+ \fn QByteArray qUncompress(const QByteArray &data)
\relates QByteArray
@@ -506,10 +506,10 @@ QByteArray qCompress(const uchar* data, int nbytes, int compressionLevel)
feature was added.
\bold{Note:} If you want to use this function to uncompress external
- data compressed using zlib, you first need to prepend four bytes to the
- byte array that contain the expected length (as an unsigned integer)
- of the uncompressed data encoded in big-endian order (most significant
- byte first).
+ data that was compressed using zlib, you first need to prepend a four
+ byte header to the byte array containing the data. The header must
+ contain the expected length (in bytes) of the uncompressed data,
+ expressed as an unsigned, big-endian, 32-bit integer.
\sa qCompress()
*/
b8e8cb3331f16">compare view</a></li> </ul> </details> <br /> Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: GH- (dependabot-automerge-start) [//]: GH- (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Automerge-Triggered-By: GH:Mariatta (cherry picked from commit cd0edbc716d64ccd437d97af1eaa3b7a6f0f6de5) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * [3.8] bpo-40592: shutil.which will not return None anymore if ; is the last ↵Miss Skeleton (bot)2020-10-233-1/+24 | | | | | | | | | | char in PATHEXT (GH-20088) (GH-22913) shutil.which will not return None anymore for empty str in PATHEXT Empty PATHEXT will now be defaulted to _WIN_DEFAULT_PATHEXT (cherry picked from commit da6f098188c9825f10ae60db8987056b3a54c2e8) Co-authored-by: Christopher Marchfelder <marchfelder@googlemail.com> * [3.8] bpo-38486: Fix dead qmail links in the mailbox docs (GH-22239) (GH-22902)Miss Skeleton (bot)2020-10-221-10/+4 | | | | | | | | (cherry picked from commit ec388cfb4ede56dace2bb78851ff6f38fa2a6abe) Co-authored-by: Zackery Spytz <zspytz@gmail.com> Automerge-Triggered-By: GH:warsaw * bpo-33987: IDLE: Use ttk Frame on doc window and statusbar (GH-11433) (GH-22900)Miss Skeleton (bot)2020-10-222-5/+9 | | | | | | (cherry picked from commit facb522d44fceaf15de6bc95de1cd680c4621c2a) Co-authored-by: Cheryl Sabella <cheryl.sabella@gmail.com> * bpo-25655: Improve Win DLL loading failures doc (GH-22372)Miss Skeleton (bot)2020-10-221-0/+15 | | | | | | | | | Add documentation to help diagnose CDLL dependent DLL loading errors on windows for OSError with message: "[WinError 126] The specified module could not be found" This error is otherwise difficult to diagnose. (cherry picked from commit b6f2fc90409e291822166d74ce7402e0ef4dba91) Co-authored-by: Philippe Ombredanne <pombredanne@gmail.com> * [3.8] Remove 3.5 from Doc version switcher in master. (GH-22886) (#22889)larryhastings2020-10-222-2/+0 | | | (cherry picked from commit 283f9a253b4ff4df728558205629b3bb3af6e47f) * bpo-41910: specify the default implementations of object.__eq__ and ↵Miss Skeleton (bot)2020-10-222-6/+9 | | | | | | | object.__ne__ (GH-22874) (#22877) See Objects/typeobject.c:object_richcompare() for the implementation of this in CPython. Co-authored-by: Brett Cannon <brett@python.org> * bpo-35181: Correct importlib documentation for some module attributes (GH-15190)Miss Skeleton (bot)2020-10-212-21/+11 | | | | | | | | | | | | | | | | | | @ericsnowcurrently This PR will change the following: In the library documentation importlib.rst: - `module.__package__` can be `module.__name__` for packages; - `spec.parent` can be `spec.__name__` for packages; - `spec.loader` is not `None` for namespaces packages. In the language documentation import.rst: - `spec.loader` is not `None` for namespace packages. Automerge-Triggered-By: GH:warsaw (cherry picked from commit 27f1bd8787d24ac53cc3dc6ea5eb00b8a3499839) Co-authored-by: Géry Ogam <gery.ogam@gmail.com> * [3.8] bpo-41959: Fix grammar around class asyncio.MultiLoopChildWatcher text ↵Miss Skeleton (bot)2020-10-211-1/+1 | | | | | | | | | (GH-22580) (GH-22866) While translating the following document to Spanish we found there is a grammar issue on the original documentation. (cherry picked from commit caff2934f46510920a6169e192707d59e9c55f6b) Co-authored-by: Raúl Cumplido <raulcumplido@gmail.com> * [3.8] bpo-39416: Document some restrictions on the default string ↵Miss Skeleton (bot)2020-10-212-0/+19 | | | | | | | | | | | | | | | | | | | | | | representations of numeric classes (GH-18111) (GH-22861) [[bpo-39416]()](): Document string representations of the Numeric classes This is a change to the specification of the Python language. The idea here is to put sane minimal limits on the Python language's default representations of its Numeric classes. That way "Marty's Robotic Massage Parlor and Python Interpreter" implementation of Python won't do anything too crazy. Some discussion in the email thread: Subject: Documenting Python's float.__str__() https://mail.python.org/archives/list/python-dev@python.org/thread/FV22TKT3S2Q3P7PNN6MCXI6IX3HRRNAL/ (cherry picked from commit c60394c7fc9cc09b16e9675a3eeb5844b6d8523f) Co-authored-by: kpinc <kop@karlpinc.com> Automerge-Triggered-By: GH:merwok * [3.8] bpo-39524: Fixed doc-string in ast._pad_whitespace (GH-18340) (GH-22857)Irit Katriel2020-10-211-1/+1 | | | Automerge-Triggered-By: GH:zware * bpo-41819: Fix compiler warning in init_dump_ascii_wstr() (GH-22332)Miss Skeleton (bot)2020-10-211-1/+1 | | | | | | | | Fix the compiler warning: format specifies type `wint_t` (aka `int`) but the argument has type `unsigned int` (cherry picked from commit c322948892438a387d752ec18d1eb512699a4d67) Co-authored-by: Samuel Marks <807580+SamuelMarks@users.noreply.github.com> * Doc: Fix a typo/error in the docs for cached bytecode (GH-22445)Miss Skeleton (bot)2020-10-211-1/+1 | | | | | (cherry picked from commit cb115e36e1aba04b90b0ecac6f043e60064ac65b) Co-authored-by: Zackery Spytz <zspytz@gmail.com> * Doc: Do not suggest `s[::-1]` for reversed order (GH-22457)Miss Skeleton (bot)2020-10-212-7/+1 | | | | | (cherry picked from commit fb2e94692e3a8eb66915575f4a122d56fe8999a0) Co-authored-by: Andre Delfino <adelfino@gmail.com> * Doc: Remove old Python version from future stmt (GH-21802)Miss Skeleton (bot)2020-10-211-2/+2 | | | | | (cherry picked from commit eba109a28f48b20b05f08abbe6604eebb07788f9) Co-authored-by: Andre Delfino <adelfino@gmail.com> * bpo-41316: Make tarfile follow specs for FNAME (GH-21511)Miss Skeleton (bot)2020-10-214-1/+17 | | | | | | | | | | | | | tarfile writes full path to FNAME field of GZIP format instead of just basename if user specified absolute path. Some archive viewers may process file incorrectly. Also it creates security issue because anyone can know structure of directories on system and know username or other personal information. RFC1952 says about FNAME: This is the original name of the file being compressed, with any directory components removed. So tarfile must remove directory names from FNAME and write only basename of file. Automerge-Triggered-By: @jaraco (cherry picked from commit 22748a83d927d3da1beaed771be30887c42b2500) Co-authored-by: Artem Bulgakov <ArtemSBulgakov@ya.ru> * bpo-41646: Mention path-like objects support in the docs for shutil.copy() ↵Miss Skeleton (bot)2020-10-211-3/+3 | | | | | | | (GH-22208) (cherry picked from commit 8f2b991eef062c22c429a96983c78be007180b66) Co-authored-by: Zackery Spytz <zspytz@gmail.com> * bpo-41192: Add documentation of undocumented audit events (GH-22832)Miss Skeleton (bot)2020-10-205-2/+56 | | | | (cherry picked from commit 3f7e990fd49dbabc1dde41ce58c1bdda9f56ead7) * bpo-38439: Add 256px IDLE icon to the .ico, drop gifs from it (GH-19648)Miss Skeleton (bot)2020-10-203-0/+6 | | | | | (cherry picked from commit faddc7449d07e883b8ad8bb95dd68ce6dbdc06e8) Co-authored-by: Miro Hrončok <miro@hroncok.cz> * bpo-38439: Update the Windows Store package's icons for IDLE. Artwork by ↵Miss Skeleton (bot)2020-10-204-2/+8 | | | | | | | Andrew Clover (GH-22817) (cherry picked from commit 6d883fbe14751b58d9ed2fd708322613d8931035) Co-authored-by: Steve Dower <steve.dower@python.org> * bpo-41192: Clarify the sys module's description of the auditing feature ↵Miss Skeleton (bot)2020-10-201-10/+25 | | | | | | | | | | (GH-22820) Co-authored-by: Éric Araujo <merwok@netwok.org> (cherry picked from commit 0c37269be7065b9b15b7b3a4406084f9535a793a) Co-authored-by: Andrew Kuchling <amk@amk.ca> Co-authored-by: Andrew Kuchling <amk@amk.ca> * Doc: Add missing spaces after period for `posix_spawn` (GH-22730)Miss Skeleton (bot)2020-10-20