diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-05-07 10:52:53 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-05-07 13:28:29 +0000 |
| commit | 35b25bc91784f5a39ee034a99167d5bfee49f74b (patch) | |
| tree | f6198a2b9f4456c05f3399d60e95da57499b0036 /src/corelib/kernel/qvariant.h | |
| parent | aea6ff4f57135b0f2f076e86e22cb87c0a7014fe (diff) | |
| parent | c2b553784dfbe0ece90f79709639e27e74359a7d (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/kernel/qvariant.h')
| -rw-r--r-- | src/corelib/kernel/qvariant.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index 924cfa1e1a5..e094ebff52a 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -393,10 +393,13 @@ class Q_CORE_EXPORT QVariant : type(variantType), is_shared(false), is_null(false) {} - inline Private(const Private &other) noexcept +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + Private(const Private &other) noexcept : data(other.data), type(other.type), is_shared(other.is_shared), is_null(other.is_null) {} + Private &operator=(const Private &other) noexcept = default; +#endif union Data { char c; |