whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Marc Mutz 2017-02-20 10:07:29 +01:00
parent 3b38392844
commit e0a9a0e217
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/tools/qarraydataops.h
View File

@ -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;