diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2013-07-13 12:04:40 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-14 03:20:25 +0200 |
commit | cc741597021dd5e9c7ca2caffaf8a15181f68e89 (patch) | |
tree | 5269f5485422717baedfc651af5decbe5a8b5875 /src/corelib/doc | |
parent | 3154e1ccaabfbdb42aa48cbb5805b23442cdc33e (diff) |
Base64: Implement the "base64url" encoding and the stripping of '='
The "base64url" encoding is defined in RFC 4648, which is the newest
version of Base64. There are also a few situations where the ending
'=' is not desired.
Change-Id: I9bb9fa55817b57d125189e4e795d6fde97caea6d
Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'src/corelib/doc')
-rw-r--r-- | src/corelib/doc/snippets/code/src_corelib_tools_qbytearray.cpp | 13 | ||||
-rw-r--r-- | src/corelib/doc/src/external-resources.qdoc | 5 |
2 files changed, 18 insertions, 0 deletions
diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qbytearray.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qbytearray.cpp index c2a375f498..003fce580b 100644 --- a/src/corelib/doc/snippets/code/src_corelib_tools_qbytearray.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_tools_qbytearray.cpp @@ -352,6 +352,14 @@ QByteArray text("Qt is great!"); text.toBase64(); // returns "UXQgaXMgZ3JlYXQh" //! [39] +//! [39bis] +QByteArray text("<p>Hello?</p>"); +text.toBase64(QByteArray::Base64 | QByteArray::OmitTrailingEquals); // returns "PHA+SGVsbG8/PC9wPg" +text.toBase64(QByteArray::Base64); // returns "PHA+SGVsbG8/PC9wPg==" +text.toBase64(QByteArray::Base64Url); // returns "PHA-SGVsbG8_PC9wPg==" +text.toBase64(QByteArray::Base64Url | QByteArray::OmitTrailingEquals); // returns "PHA-SGVsbG8_PC9wPg" +//! [39bis] + //! [40] QByteArray ba; @@ -394,6 +402,11 @@ QByteArray text = QByteArray::fromBase64("UXQgaXMgZ3JlYXQh"); text.data(); // returns "Qt is great!" //! [44] +//! [44bis] +QByteArray::fromBase64("PHA+SGVsbG8/PC9wPg==", QByteArray::Base64Encoding); // returns "<p>Hello?</p>" +QByteArray::fromBase64("PHA-SGVsbG8_PC9wPg==", QByteArray::Base64UrlEncoding); // returns "<p>Hello?</p>" +//! [44bis] + //! [45] QByteArray text = QByteArray::fromHex("517420697320677265617421"); diff --git a/src/corelib/doc/src/external-resources.qdoc b/src/corelib/doc/src/external-resources.qdoc index 86df385d9e..d1c7eb5d1b 100644 --- a/src/corelib/doc/src/external-resources.qdoc +++ b/src/corelib/doc/src/external-resources.qdoc @@ -67,6 +67,11 @@ */ /*! + \externalpage http://www.ietf.org/rfc/rfc4648.txt + \title RFC 4648 +*/ + +/*! \externalpage http://www.iana.org/assignments/character-sets/character-sets.xml \title IANA character-sets encoding file */ |