diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2017-02-20 10:07:29 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2017-02-22 07:12:13 +0000 |
| commit | e0a9a0e2179a5f44b98eff9fec607a01dedf07b0 (patch) | |
| tree | 0cb058ab798772317ab6f00c0bc1e5bed36a11df /src/corelib/tools/qarraydataops.h | |
| parent | 3b38392844dd9e145a4783445fd3c96e84bb94d1 (diff) | |
QArrayDataOps: do not use QTypeInfo::isStatic anymore
These days, QTypeInfoQuery and isRelocatable should be used.
Change-Id: Ieac2d7fcef6b1d5466b14bbd1066901d6e751a55
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools/qarraydataops.h')
| -rw-r--r-- | src/corelib/tools/qarraydataops.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qarraydataops.h b/src/corelib/tools/qarraydataops.h index 47a19dd75d..847f6806de 100644 --- a/src/corelib/tools/qarraydataops.h +++ b/src/corelib/tools/qarraydataops.h @@ -412,7 +412,7 @@ struct QArrayOpsSelector template <class T> struct QArrayOpsSelector<T, typename std::enable_if< - !QTypeInfo<T>::isComplex && !QTypeInfo<T>::isStatic + !QTypeInfoQuery<T>::isComplex && QTypeInfoQuery<T>::isRelocatable >::type> { typedef QPodArrayOps<T> Type; @@ -421,7 +421,7 @@ struct QArrayOpsSelector<T, template <class T> struct QArrayOpsSelector<T, typename std::enable_if< - QTypeInfo<T>::isComplex && !QTypeInfo<T>::isStatic + QTypeInfoQuery<T>::isComplex && QTypeInfoQuery<T>::isRelocatable >::type> { typedef QMovableArrayOps<T> Type; |