diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2017-02-24 00:10:11 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2017-02-24 08:03:32 +0000 |
| commit | f4495d29e5ad46cacf4f30c6da1fcb96c8082d64 (patch) | |
| tree | acc9c0f7fe5101dab5d9baa3be6af522520394cf /src/corelib/tools | |
| parent | 46d4dc8afb4c38165b3b050e44170d9f3b03a0f5 (diff) | |
Clean up QByteArrayLiteral definition
Remove the dead QByteArray(data, size) fall-back. We've been
requiring lambdas since Qt 5.7.
Change-Id: I4d9023ab4583f2ee80a74a828fba0d95c2fdb0df
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qbytearray.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/tools/qbytearray.h index af85d27868..06a50e5990 100644 --- a/src/corelib/tools/qbytearray.h +++ b/src/corelib/tools/qbytearray.h @@ -140,8 +140,6 @@ struct QByteArrayDataPtr Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(size, sizeof(QByteArrayData)) \ /**/ -#if defined(Q_COMPILER_LAMBDA) - # define QByteArrayLiteral(str) \ ([]() -> QByteArray { \ enum { Size = sizeof(str) - 1 }; \ @@ -154,14 +152,6 @@ struct QByteArrayDataPtr }()) \ /**/ -#endif - -#ifndef QByteArrayLiteral -// no lambdas, not GCC, just return a temporary QByteArray - -# define QByteArrayLiteral(str) QByteArray(str, sizeof(str) - 1) -#endif - class Q_CORE_EXPORT QByteArray { private: |