From 1a79303169e245891a911174b6f1fa87fd177597 Mon Sep 17 00:00:00 2001 From: Linus Jahn Date: Tue, 31 Jan 2023 19:55:13 +0100 Subject: Remove Qt < 5.15 compat code --- src/base/QXmppBitsOfBinaryContentId.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/base/QXmppBitsOfBinaryContentId.cpp') diff --git a/src/base/QXmppBitsOfBinaryContentId.cpp b/src/base/QXmppBitsOfBinaryContentId.cpp index a348b2f8..46e203a8 100644 --- a/src/base/QXmppBitsOfBinaryContentId.cpp +++ b/src/base/QXmppBitsOfBinaryContentId.cpp @@ -219,21 +219,16 @@ void QXmppBitsOfBinaryContentId::setAlgorithm(QCryptographicHash::Algorithm algo /// /// Checks whether the content id is valid and can be serialized into a string. /// -/// \note Checking the hash length requires QXmpp to be built with Qt 5.12.0 or -/// later. +/// Also checks the length of the hash. /// /// \returns True, if the set hashing algorithm is supported, a hash value is /// set and its length is correct, false otherwise. /// bool QXmppBitsOfBinaryContentId::isValid() const { -#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) return !d->hash.isEmpty() && HASH_ALGORITHMS.contains(d->algorithm) && d->hash.length() == QCryptographicHash::hashLength(d->algorithm); -#else - return !d->hash.isEmpty() && HASH_ALGORITHMS.contains(d->algorithm); -#endif } /// -- cgit v1.2.3