diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-05-07 11:44:37 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-05-07 11:58:30 +0200 |
| commit | c2b553784dfbe0ece90f79709639e27e74359a7d (patch) | |
| tree | 04b0c74c7417a5f1b628d0b18a07f9dd8be1df60 /src/corelib/kernel/qvariant.h | |
| parent | 0b373c2e36a68aedf3731fcb3cd84fd010c2d67c (diff) | |
| parent | 8ea0a82a6a771dd76df2d51c6ef3ed966a5b9b45 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/corelib/kernel/qobject.cpp
src/corelib/kernel/qvariant.h
src/corelib/tools/qlist.h
Done-With: Milian Wolff <milian.wolff@kdab.com>
Done-With: Allan Sandfeld Jensen <allan.jensen@qt.io>
Change-Id: I6803f7239aa137a51a7467fab7cc7a01302a848d
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 924cfa1e1a..e094ebff52 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; |