1 files changed, 39 insertions, 0 deletions
diff --git a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro
index 373e8801a4..58e5b157bd 100644
--- a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro
+++ b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro
@@ -17,3 +17,42 @@ SUBDIRS=\
     ushort \
     wchar_t \
 
+
+contains(QT_CONFIG, c++11)|msvc: SUBDIRS +=\
+    cxx11/char \
+    cxx11/char16_t \
+    cxx11/char32_t \
+    cxx11/int \
+    cxx11/long \
+    cxx11/qlonglong \
+    cxx11/qptrdiff \
+    cxx11/quintptr \
+    cxx11/qulonglong \
+    cxx11/schar \
+    cxx11/short \
+    cxx11/uchar \
+    cxx11/uint \
+    cxx11/ulong \
+    cxx11/ushort \
+    cxx11/wchar_t \
+
+
+# The GCC-style atomics only support 32-bit and pointer-sized but add
+# them all anyway so we ensure the macros are properly defined
+gcc: SUBDIRS +=\
+    gcc/char \
+    gcc/char16_t \
+    gcc/char32_t \
+    gcc/int \
+    gcc/long \
+    gcc/qlonglong \
+    gcc/qptrdiff \
+    gcc/quintptr \
+    gcc/qulonglong \
+    gcc/schar \
+    gcc/short \
+    gcc/uchar \
+    gcc/uint \
+    gcc/ulong \
+    gcc/ushort \
+    gcc/wchar_t \