From e0a9a0e2179a5f44b98eff9fec607a01dedf07b0 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Mon, 20 Feb 2017 10:07:29 +0100
Subject: [PATCH] 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>
---
 src/corelib/tools/qarraydataops.h | 4 ++--
 1 file 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;