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>bb10
parent
46d4dc8afb
commit
f4495d29e5
|
|
@ -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:
|
||||
|
|
|
|||
Loading…
Reference in New Issue