diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-08-22 00:11:16 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-22 02:04:39 +0200 |
| commit | c374f4441ab42d1849431bb42fec91a976a8e502 (patch) | |
| tree | 0733146c5df48b91a39097730c445dbe9cd2359a /src/corelib/tools/qcryptographichash.h | |
| parent | 85b24bb2dea97c3a9b013bacd5a422b26fe5d14b (diff) | |
| parent | c8ca300e491c186304d0864a9e870337e891e6f7 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/tools/qcryptographichash.h')
| -rw-r--r-- | src/corelib/tools/qcryptographichash.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/corelib/tools/qcryptographichash.h b/src/corelib/tools/qcryptographichash.h index d4e75c4667..c4f7c3ab4a 100644 --- a/src/corelib/tools/qcryptographichash.h +++ b/src/corelib/tools/qcryptographichash.h @@ -55,9 +55,12 @@ class Q_CORE_EXPORT QCryptographicHash { public: enum Algorithm { +#ifndef QT_CRYPTOGRAPHICHASH_ONLY_SHA1 Md4, Md5, - Sha1, +#endif + Sha1 = 2, +#ifndef QT_CRYPTOGRAPHICHASH_ONLY_SHA1 Sha224, Sha256, Sha384, @@ -66,6 +69,7 @@ public: Sha3_256, Sha3_384, Sha3_512 +#endif }; explicit QCryptographicHash(Algorithm method); |