From 9d1fab424e38d0ed40677926c0a434272ad41320 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 8 Jul 2015 14:35:03 -0700 Subject: Make the C++11 atomic support the default, if available Change-Id: Ib056b47dde3341ef9a52ffff13ef1647ccd607b1 Reviewed-by: Lars Knoll --- .../thread/qatomicinteger/cxx11/char/char.pro | 1 - .../qatomicinteger/cxx11/char16_t/char16_t.pro | 1 - .../qatomicinteger/cxx11/char32_t/char32_t.pro | 1 - .../thread/qatomicinteger/cxx11/int/int.pro | 1 - .../thread/qatomicinteger/cxx11/long/long.pro | 1 - .../qatomicinteger/cxx11/qlonglong/qlonglong.pro | 1 - .../qatomicinteger/cxx11/qptrdiff/qptrdiff.pro | 1 - .../qatomicinteger/cxx11/quintptr/quintptr.pro | 1 - .../qatomicinteger/cxx11/qulonglong/qulonglong.pro | 1 - .../thread/qatomicinteger/cxx11/schar/schar.pro | 1 - .../thread/qatomicinteger/cxx11/short/short.pro | 1 - .../thread/qatomicinteger/cxx11/uchar/uchar.pro | 1 - .../thread/qatomicinteger/cxx11/uint/uint.pro | 1 - .../thread/qatomicinteger/cxx11/ulong/ulong.pro | 1 - .../thread/qatomicinteger/cxx11/ushort/ushort.pro | 1 - .../qatomicinteger/cxx11/wchar_t/wchar_t.pro | 1 - .../thread/qatomicinteger/no-cxx11/char/char.pro | 1 + .../qatomicinteger/no-cxx11/char16_t/char16_t.pro | 1 + .../qatomicinteger/no-cxx11/char32_t/char32_t.pro | 1 + .../thread/qatomicinteger/no-cxx11/int/int.pro | 1 + .../thread/qatomicinteger/no-cxx11/long/long.pro | 1 + .../no-cxx11/qlonglong/qlonglong.pro | 1 + .../qatomicinteger/no-cxx11/qptrdiff/qptrdiff.pro | 1 + .../qatomicinteger/no-cxx11/quintptr/quintptr.pro | 1 + .../no-cxx11/qulonglong/qulonglong.pro | 1 + .../thread/qatomicinteger/no-cxx11/schar/schar.pro | 1 + .../thread/qatomicinteger/no-cxx11/short/short.pro | 1 + .../thread/qatomicinteger/no-cxx11/uchar/uchar.pro | 1 + .../thread/qatomicinteger/no-cxx11/uint/uint.pro | 1 + .../thread/qatomicinteger/no-cxx11/ulong/ulong.pro | 1 + .../qatomicinteger/no-cxx11/ushort/ushort.pro | 1 + .../qatomicinteger/no-cxx11/wchar_t/wchar_t.pro | 1 + .../thread/qatomicinteger/qatomicinteger.pri | 6 ++-- .../thread/qatomicinteger/qatomicinteger.pro | 32 +++++++++++----------- 34 files changed, 35 insertions(+), 35 deletions(-) delete mode 100644 tests/auto/corelib/thread/qatomicinteger/cxx11/char/char.pro delete mode 100644 tests/auto/corelib/thread/qatomicinteger/cxx11/char16_t/char16_t.pro delete mode 100644 tests/auto/corelib/thread/qatomicinteger/cxx11/char32_t/char32_t.pro delete mode 100644 tests/auto/corelib/thread/qatomicinteger/cxx11/int/int.pro delete mode 100644 tests/auto/corelib/thread/qatomicinteger/cxx11/long/long.pro delete mode 100644 tests/auto/corelib/thread/qatomicinteger/cxx11/qlonglong/qlonglong.pro delete mode 100644 tests/auto/corelib/thread/qatomicinteger/cxx11/qptrdiff/qptrdiff.pro delete mode 100644 tests/auto/corelib/thread/qatomicinteger/cxx11/quintptr/quintptr.pro delete mode 100644 tests/auto/corelib/thread/qatomicinteger/cxx11/qulonglong/qulonglong.pro delete mode 100644 tests/auto/corelib/thread/qatomicinteger/cxx11/schar/schar.pro delete mode 100644 tests/auto/corelib/thread/qatomicinteger/cxx11/short/short.pro delete mode 100644 tests/auto/corelib/thread/qatomicinteger/cxx11/uchar/uchar.pro delete mode 100644 tests/auto/corelib/thread/qatomicinteger/cxx11/uint/uint.pro delete mode 100644 tests/auto/corelib/thread/qatomicinteger/cxx11/ulong/ulong.pro delete mode 100644 tests/auto/corelib/thread/qatomicinteger/cxx11/ushort/ushort.pro delete mode 100644 tests/auto/corelib/thread/qatomicinteger/cxx11/wchar_t/wchar_t.pro create mode 100644 tests/auto/corelib/thread/qatomicinteger/no-cxx11/char/char.pro create mode 100644 tests/auto/corelib/thread/qatomicinteger/no-cxx11/char16_t/char16_t.pro create mode 100644 tests/auto/corelib/thread/qatomicinteger/no-cxx11/char32_t/char32_t.pro create mode 100644 tests/auto/corelib/thread/qatomicinteger/no-cxx11/int/int.pro create mode 100644 tests/auto/corelib/thread/qatomicinteger/no-cxx11/long/long.pro create mode 100644 tests/auto/corelib/thread/qatomicinteger/no-cxx11/qlonglong/qlonglong.pro create mode 100644 tests/auto/corelib/thread/qatomicinteger/no-cxx11/qptrdiff/qptrdiff.pro create mode 100644 tests/auto/corelib/thread/qatomicinteger/no-cxx11/quintptr/quintptr.pro create mode 100644 tests/auto/corelib/thread/qatomicinteger/no-cxx11/qulonglong/qulonglong.pro create mode 100644 tests/auto/corelib/thread/qatomicinteger/no-cxx11/schar/schar.pro create mode 100644 tests/auto/corelib/thread/qatomicinteger/no-cxx11/short/short.pro create mode 100644 tests/auto/corelib/thread/qatomicinteger/no-cxx11/uchar/uchar.pro create mode 100644 tests/auto/corelib/thread/qatomicinteger/no-cxx11/uint/uint.pro create mode 100644 tests/auto/corelib/thread/qatomicinteger/no-cxx11/ulong/ulong.pro create mode 100644 tests/auto/corelib/thread/qatomicinteger/no-cxx11/ushort/ushort.pro create mode 100644 tests/auto/corelib/thread/qatomicinteger/no-cxx11/wchar_t/wchar_t.pro (limited to 'tests/auto/corelib/thread') diff --git a/tests/auto/corelib/thread/qatomicinteger/cxx11/char/char.pro b/tests/auto/corelib/thread/qatomicinteger/cxx11/char/char.pro deleted file mode 100644 index 64401f0229..0000000000 --- a/tests/auto/corelib/thread/qatomicinteger/cxx11/char/char.pro +++ /dev/null @@ -1 +0,0 @@ -include(../../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/cxx11/char16_t/char16_t.pro b/tests/auto/corelib/thread/qatomicinteger/cxx11/char16_t/char16_t.pro deleted file mode 100644 index 64401f0229..0000000000 --- a/tests/auto/corelib/thread/qatomicinteger/cxx11/char16_t/char16_t.pro +++ /dev/null @@ -1 +0,0 @@ -include(../../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/cxx11/char32_t/char32_t.pro b/tests/auto/corelib/thread/qatomicinteger/cxx11/char32_t/char32_t.pro deleted file mode 100644 index 64401f0229..0000000000 --- a/tests/auto/corelib/thread/qatomicinteger/cxx11/char32_t/char32_t.pro +++ /dev/null @@ -1 +0,0 @@ -include(../../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/cxx11/int/int.pro b/tests/auto/corelib/thread/qatomicinteger/cxx11/int/int.pro deleted file mode 100644 index 64401f0229..0000000000 --- a/tests/auto/corelib/thread/qatomicinteger/cxx11/int/int.pro +++ /dev/null @@ -1 +0,0 @@ -include(../../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/cxx11/long/long.pro b/tests/auto/corelib/thread/qatomicinteger/cxx11/long/long.pro deleted file mode 100644 index 64401f0229..0000000000 --- a/tests/auto/corelib/thread/qatomicinteger/cxx11/long/long.pro +++ /dev/null @@ -1 +0,0 @@ -include(../../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/cxx11/qlonglong/qlonglong.pro b/tests/auto/corelib/thread/qatomicinteger/cxx11/qlonglong/qlonglong.pro deleted file mode 100644 index 64401f0229..0000000000 --- a/tests/auto/corelib/thread/qatomicinteger/cxx11/qlonglong/qlonglong.pro +++ /dev/null @@ -1 +0,0 @@ -include(../../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/cxx11/qptrdiff/qptrdiff.pro b/tests/auto/corelib/thread/qatomicinteger/cxx11/qptrdiff/qptrdiff.pro deleted file mode 100644 index 64401f0229..0000000000 --- a/tests/auto/corelib/thread/qatomicinteger/cxx11/qptrdiff/qptrdiff.pro +++ /dev/null @@ -1 +0,0 @@ -include(../../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/cxx11/quintptr/quintptr.pro b/tests/auto/corelib/thread/qatomicinteger/cxx11/quintptr/quintptr.pro deleted file mode 100644 index 64401f0229..0000000000 --- a/tests/auto/corelib/thread/qatomicinteger/cxx11/quintptr/quintptr.pro +++ /dev/null @@ -1 +0,0 @@ -include(../../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/cxx11/qulonglong/qulonglong.pro b/tests/auto/corelib/thread/qatomicinteger/cxx11/qulonglong/qulonglong.pro deleted file mode 100644 index 64401f0229..0000000000 --- a/tests/auto/corelib/thread/qatomicinteger/cxx11/qulonglong/qulonglong.pro +++ /dev/null @@ -1 +0,0 @@ -include(../../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/cxx11/schar/schar.pro b/tests/auto/corelib/thread/qatomicinteger/cxx11/schar/schar.pro deleted file mode 100644 index 64401f0229..0000000000 --- a/tests/auto/corelib/thread/qatomicinteger/cxx11/schar/schar.pro +++ /dev/null @@ -1 +0,0 @@ -include(../../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/cxx11/short/short.pro b/tests/auto/corelib/thread/qatomicinteger/cxx11/short/short.pro deleted file mode 100644 index 64401f0229..0000000000 --- a/tests/auto/corelib/thread/qatomicinteger/cxx11/short/short.pro +++ /dev/null @@ -1 +0,0 @@ -include(../../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/cxx11/uchar/uchar.pro b/tests/auto/corelib/thread/qatomicinteger/cxx11/uchar/uchar.pro deleted file mode 100644 index 64401f0229..0000000000 --- a/tests/auto/corelib/thread/qatomicinteger/cxx11/uchar/uchar.pro +++ /dev/null @@ -1 +0,0 @@ -include(../../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/cxx11/uint/uint.pro b/tests/auto/corelib/thread/qatomicinteger/cxx11/uint/uint.pro deleted file mode 100644 index 64401f0229..0000000000 --- a/tests/auto/corelib/thread/qatomicinteger/cxx11/uint/uint.pro +++ /dev/null @@ -1 +0,0 @@ -include(../../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/cxx11/ulong/ulong.pro b/tests/auto/corelib/thread/qatomicinteger/cxx11/ulong/ulong.pro deleted file mode 100644 index 64401f0229..0000000000 --- a/tests/auto/corelib/thread/qatomicinteger/cxx11/ulong/ulong.pro +++ /dev/null @@ -1 +0,0 @@ -include(../../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/cxx11/ushort/ushort.pro b/tests/auto/corelib/thread/qatomicinteger/cxx11/ushort/ushort.pro deleted file mode 100644 index 64401f0229..0000000000 --- a/tests/auto/corelib/thread/qatomicinteger/cxx11/ushort/ushort.pro +++ /dev/null @@ -1 +0,0 @@ -include(../../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/cxx11/wchar_t/wchar_t.pro b/tests/auto/corelib/thread/qatomicinteger/cxx11/wchar_t/wchar_t.pro deleted file mode 100644 index 64401f0229..0000000000 --- a/tests/auto/corelib/thread/qatomicinteger/cxx11/wchar_t/wchar_t.pro +++ /dev/null @@ -1 +0,0 @@ -include(../../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/no-cxx11/char/char.pro b/tests/auto/corelib/thread/qatomicinteger/no-cxx11/char/char.pro new file mode 100644 index 0000000000..64401f0229 --- /dev/null +++ b/tests/auto/corelib/thread/qatomicinteger/no-cxx11/char/char.pro @@ -0,0 +1 @@ +include(../../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/no-cxx11/char16_t/char16_t.pro b/tests/auto/corelib/thread/qatomicinteger/no-cxx11/char16_t/char16_t.pro new file mode 100644 index 0000000000..64401f0229 --- /dev/null +++ b/tests/auto/corelib/thread/qatomicinteger/no-cxx11/char16_t/char16_t.pro @@ -0,0 +1 @@ +include(../../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/no-cxx11/char32_t/char32_t.pro b/tests/auto/corelib/thread/qatomicinteger/no-cxx11/char32_t/char32_t.pro new file mode 100644 index 0000000000..64401f0229 --- /dev/null +++ b/tests/auto/corelib/thread/qatomicinteger/no-cxx11/char32_t/char32_t.pro @@ -0,0 +1 @@ +include(../../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/no-cxx11/int/int.pro b/tests/auto/corelib/thread/qatomicinteger/no-cxx11/int/int.pro new file mode 100644 index 0000000000..64401f0229 --- /dev/null +++ b/tests/auto/corelib/thread/qatomicinteger/no-cxx11/int/int.pro @@ -0,0 +1 @@ +include(../../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/no-cxx11/long/long.pro b/tests/auto/corelib/thread/qatomicinteger/no-cxx11/long/long.pro new file mode 100644 index 0000000000..64401f0229 --- /dev/null +++ b/tests/auto/corelib/thread/qatomicinteger/no-cxx11/long/long.pro @@ -0,0 +1 @@ +include(../../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/no-cxx11/qlonglong/qlonglong.pro b/tests/auto/corelib/thread/qatomicinteger/no-cxx11/qlonglong/qlonglong.pro new file mode 100644 index 0000000000..64401f0229 --- /dev/null +++ b/tests/auto/corelib/thread/qatomicinteger/no-cxx11/qlonglong/qlonglong.pro @@ -0,0 +1 @@ +include(../../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/no-cxx11/qptrdiff/qptrdiff.pro b/tests/auto/corelib/thread/qatomicinteger/no-cxx11/qptrdiff/qptrdiff.pro new file mode 100644 index 0000000000..64401f0229 --- /dev/null +++ b/tests/auto/corelib/thread/qatomicinteger/no-cxx11/qptrdiff/qptrdiff.pro @@ -0,0 +1 @@ +include(../../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/no-cxx11/quintptr/quintptr.pro b/tests/auto/corelib/thread/qatomicinteger/no-cxx11/quintptr/quintptr.pro new file mode 100644 index 0000000000..64401f0229 --- /dev/null +++ b/tests/auto/corelib/thread/qatomicinteger/no-cxx11/quintptr/quintptr.pro @@ -0,0 +1 @@ +include(../../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/no-cxx11/qulonglong/qulonglong.pro b/tests/auto/corelib/thread/qatomicinteger/no-cxx11/qulonglong/qulonglong.pro new file mode 100644 index 0000000000..64401f0229 --- /dev/null +++ b/tests/auto/corelib/thread/qatomicinteger/no-cxx11/qulonglong/qulonglong.pro @@ -0,0 +1 @@ +include(../../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/no-cxx11/schar/schar.pro b/tests/auto/corelib/thread/qatomicinteger/no-cxx11/schar/schar.pro new file mode 100644 index 0000000000..64401f0229 --- /dev/null +++ b/tests/auto/corelib/thread/qatomicinteger/no-cxx11/schar/schar.pro @@ -0,0 +1 @@ +include(../../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/no-cxx11/short/short.pro b/tests/auto/corelib/thread/qatomicinteger/no-cxx11/short/short.pro new file mode 100644 index 0000000000..64401f0229 --- /dev/null +++ b/tests/auto/corelib/thread/qatomicinteger/no-cxx11/short/short.pro @@ -0,0 +1 @@ +include(../../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/no-cxx11/uchar/uchar.pro b/tests/auto/corelib/thread/qatomicinteger/no-cxx11/uchar/uchar.pro new file mode 100644 index 0000000000..64401f0229 --- /dev/null +++ b/tests/auto/corelib/thread/qatomicinteger/no-cxx11/uchar/uchar.pro @@ -0,0 +1 @@ +include(../../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/no-cxx11/uint/uint.pro b/tests/auto/corelib/thread/qatomicinteger/no-cxx11/uint/uint.pro new file mode 100644 index 0000000000..64401f0229 --- /dev/null +++ b/tests/auto/corelib/thread/qatomicinteger/no-cxx11/uint/uint.pro @@ -0,0 +1 @@ +include(../../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/no-cxx11/ulong/ulong.pro b/tests/auto/corelib/thread/qatomicinteger/no-cxx11/ulong/ulong.pro new file mode 100644 index 0000000000..64401f0229 --- /dev/null +++ b/tests/auto/corelib/thread/qatomicinteger/no-cxx11/ulong/ulong.pro @@ -0,0 +1 @@ +include(../../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/no-cxx11/ushort/ushort.pro b/tests/auto/corelib/thread/qatomicinteger/no-cxx11/ushort/ushort.pro new file mode 100644 index 0000000000..64401f0229 --- /dev/null +++ b/tests/auto/corelib/thread/qatomicinteger/no-cxx11/ushort/ushort.pro @@ -0,0 +1 @@ +include(../../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/no-cxx11/wchar_t/wchar_t.pro b/tests/auto/corelib/thread/qatomicinteger/no-cxx11/wchar_t/wchar_t.pro new file mode 100644 index 0000000000..64401f0229 --- /dev/null +++ b/tests/auto/corelib/thread/qatomicinteger/no-cxx11/wchar_t/wchar_t.pro @@ -0,0 +1 @@ +include(../../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pri b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pri index d9ebe64d5b..e80e71f238 100644 --- a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pri +++ b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pri @@ -3,9 +3,9 @@ TYPE = $$basename(_PRO_FILE_PWD_) dn = $$dirname(_PRO_FILE_PWD_) FORCE = $$basename(dn) -equals(FORCE, cxx11) { - suffix = Cxx11_$$TYPE - DEFINES += QT_ATOMIC_FORCE_CXX11 +equals(FORCE, no-cxx11) { + suffix = NoCxx11_$$TYPE + DEFINES += QT_ATOMIC_FORCE_NO_CXX11 } else: equals(FORCE, gcc) { suffix = Gcc_$$TYPE DEFINES += QT_ATOMIC_FORCE_GCC diff --git a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro index 58e5b157bd..9d929e649e 100644 --- a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro +++ b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro @@ -19,22 +19,22 @@ SUBDIRS=\ 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 \ + no-cxx11/char \ + no-cxx11/char16_t \ + no-cxx11/char32_t \ + no-cxx11/int \ + no-cxx11/long \ + no-cxx11/qlonglong \ + no-cxx11/qptrdiff \ + no-cxx11/quintptr \ + no-cxx11/qulonglong \ + no-cxx11/schar \ + no-cxx11/short \ + no-cxx11/uchar \ + no-cxx11/uint \ + no-cxx11/ulong \ + no-cxx11/ushort \ + no-cxx11/wchar_t \ # The GCC-style atomics only support 32-bit and pointer-sized but add -- cgit v1.2.3