diff options
author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-11-19 15:55:34 +0100 |
---|---|---|
committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-11-24 05:14:45 +0000 |
commit | bcd38a96149f5397375b57e948c05c7a8f172194 (patch) | |
tree | 8dc73dcb1c990c9a7863d14341970708a221a546 | |
parent | 12651fc4be9b158fc74af8b4360cc8237dcc4576 (diff) | |
download | qtbase-bcd38a96149f5397375b57e948c05c7a8f172194.tar.gz |
Re-fix the definition of primitive typesv6.0.0-rc1
The conditions are AND, not OR. Technically we don't rely on
not having constructors any more, but we may reserve the right
in the future to have uninitialized resizes.
Change-Id: Icfae61079a544f7ac8e90a32ad605c12cfa8b4aa
Pick-to: 6.0 dev
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r-- | src/corelib/global/qglobal.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index a1a27376e7..62ca2ca8a1 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -3973,7 +3973,7 @@ bool qunsetenv(const char *varName) \list \li \c Q_PRIMITIVE_TYPE specifies that \a Type is a POD (plain old - data) type with no constructor or destructor, or else a type memcpy()ing + data) type with no constructor or destructor, and for which memcpy()ing creates a valid independent copy of the object. \li \c Q_RELOCATABLE_TYPE specifies that \a Type has a constructor and/or a destructor but can be moved in memory using \c |