diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-27 16:39:07 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-09-14 09:47:51 +0200 |
| commit | 533df067e9869522b348d172fee85b2a501540b6 (patch) | |
| tree | 6e8472798e855a5206f357317f9267b8042cfffe /tests/auto/corelib/thread | |
| parent | c4378b8620453cd4bfaf12e45f623b3bdc1038e2 (diff) | |
Purge Q_{STDLIB,COMPILER}_UNICODE_STRINGS
These were now always defined, hence redundant.
Leave the #define in place so that we can verify we actually do always
define it, in a #else of an existing #if check on it.
Change-Id: Iea4c3dbc8f9982268bcf81da5ef17fe2ebf5c462
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib/thread')
| -rw-r--r-- | tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp | 8 |
2 files changed, 2 insertions, 10 deletions
diff --git a/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp b/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp index e447f27653..ef00be31c5 100644 --- a/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp +++ b/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp @@ -177,10 +177,8 @@ void tst_QAtomicInt::warningFreeHelper() warningFreeHelperTemplate<unsigned int, QBasicAtomicInteger<unsigned int> >(); constexprFunctionsHelperTemplate<QBasicAtomicInteger<int> >(); constexprFunctionsHelperTemplate<QBasicAtomicInteger<unsigned int> >(); -# ifdef Q_COMPILER_UNICODE_STRINGS warningFreeHelperTemplate<qint16, QBasicAtomicInteger<char32_t> >(); constexprFunctionsHelperTemplate<QBasicAtomicInteger<char32_t> >(); -# endif // pointer-sized integers are always supported: warningFreeHelperTemplate<int, QBasicAtomicInteger<qptrdiff> >(); @@ -199,10 +197,8 @@ void tst_QAtomicInt::warningFreeHelper() warningFreeHelperTemplate<quint16, QBasicAtomicInteger<quint16> >(); constexprFunctionsHelperTemplate<QBasicAtomicInteger<qint16> >(); constexprFunctionsHelperTemplate<QBasicAtomicInteger<quint16> >(); -# ifdef Q_COMPILER_UNICODE_STRINGS warningFreeHelperTemplate<qint16, QBasicAtomicInteger<char16_t> >(); constexprFunctionsHelperTemplate<QBasicAtomicInteger<char16_t> >(); -# endif #endif #ifdef Q_ATOMIC_INT8_IS_SUPPORTED diff --git a/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp b/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp index a553580c30..a56a3f645f 100644 --- a/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp +++ b/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp @@ -75,9 +75,7 @@ || (defined(WCHAR_MAX) && (WCHAR_MAX-0 > 0x10000)) # define TYPE_SUPPORTED_wchar_t 1 #endif -#ifdef Q_COMPILER_UNICODE_STRINGS -# define TYPE_SUPPORTED_char32_t 1 -#endif +#define TYPE_SUPPORTED_char32_t 1 #ifdef Q_ATOMIC_INT8_IS_SUPPORTED # define TYPE_SUPPORTED_char 1 @@ -87,9 +85,7 @@ #ifdef Q_ATOMIC_INT16_IS_SUPPORTED # define TYPE_SUPPORTED_short 1 # define TYPE_SUPPORTED_ushort 1 -# ifdef Q_COMPILER_UNICODE_STRINGS -# define TYPE_SUPPORTED_char16_t 1 -# endif +# define TYPE_SUPPORTED_char16_t 1 # ifndef TYPE_SUPPORTED_wchar_t # define TYPE_SUPPORTED_wchar_t 1 # endif |