diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-08-26 14:34:11 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-08-26 17:34:55 +0200 |
| commit | a5c71e4366cc048858c08ed308be694bde053da7 (patch) | |
| tree | c0a62b9c49c257781fb947d667587d0617d1aead /src/corelib/kernel/qvariant.cpp | |
| parent | 639c2e7f20a409915510892d3d0f8d5b4f4865e2 (diff) | |
Remove the alignas() from QVariant::Private
This was causing miscompilations with clang on macOS. As it's
not really required, remove the alignment requirement.
Change-Id: Iacef1af7f51990daddc73fe74449adc1a823aa33
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/corelib/kernel/qvariant.cpp')
| -rw-r--r-- | src/corelib/kernel/qvariant.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index 1bc676a36c..4f92a81cf1 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -255,7 +255,7 @@ static void customConstruct(QVariant::Private *d, const void *copy) return; } - if (QVariant::Private::canUseInternalSpace(size)) { + if (QVariant::Private::canUseInternalSpace(size, type.alignOf())) { type.construct(&d->data, copy); d->is_shared = false; } else { |