Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Idec54e19963e8d88c711cb179cffc81596323899

1 files changed, 2 insertions, 2 deletions

diff --git a/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp b/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp
index 6ddd2ff233..6f8dc13325 100644
--- a/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp
+++ b/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp
@@ -181,12 +181,12 @@ private Q_SLOTS:
 };
 
 template <bool> inline void booleanHelper() { }
-template <typename T> struct TypeInStruct { T type; };
+struct TypeInStruct { TEST_TYPE type; };
 
 void tst_QAtomicIntegerXX::static_checks()
 {
     Q_STATIC_ASSERT(sizeof(QAtomicInteger<T>) == sizeof(T));
-    Q_STATIC_ASSERT(Q_ALIGNOF(QAtomicInteger<T>) == Q_ALIGNOF(TypeInStruct<T>));
+    Q_STATIC_ASSERT(Q_ALIGNOF(QAtomicInteger<T>) == Q_ALIGNOF(TypeInStruct));
 
     // statements with no effect
     (void) QAtomicInteger<T>::isReferenceCountingNative();