diff options
| author | Tatiana Borisova <tatiana.borisova@qt.io> | 2021-09-21 15:47:01 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-22 12:11:03 +0000 |
| commit | ee052db1c11d220db35c8da59fbe3b36ed935b47 (patch) | |
| tree | b1e015092e2ffc4dfffaad528e4cbdd62e6c4528 /tests/shared | |
| parent | 5c7b3db32bf383afa00050370222f39e0f3083ca (diff) | |
locale: INTEGRITY does not define LC_MEASUREMENTS
- It does however use the Unix backend for system locale, so don't entirely
skip setting environment variable, only leave out LC_MEASUREMENTS.
Change-Id: If292f1077851b29da2a21af7c46f4db9c0e4ed19
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit dbab92688319fdb33f5177adb2572fc954ddebe0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests/shared')
| -rw-r--r-- | tests/shared/localechange.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/shared/localechange.h b/tests/shared/localechange.h index b363af1175..9b6deaa29d 100644 --- a/tests/shared/localechange.h +++ b/tests/shared/localechange.h @@ -52,7 +52,7 @@ namespace QTestLocaleChange { const int m_category; const QByteArray m_prior; const bool m_didSet; -#if !defined(QT_NO_SYSTEMLOCALE) && defined(Q_OS_UNIX) && !defined(Q_OS_INTEGRITY) \ +#if !defined(QT_NO_SYSTEMLOCALE) && defined(Q_OS_UNIX) \ && (!defined(Q_OS_DARWIN) || defined(Q_OS_NACL)) #define TRANSIENT_ENV // Unix system locale consults environment variables, so we need to set @@ -65,7 +65,7 @@ namespace QTestLocaleChange { #define CASE(cat) case cat: return #cat CASE(LC_ALL); CASE(LC_NUMERIC); CASE(LC_TIME); CASE(LC_MONETARY); CASE(LC_MESSAGES); CASE(LC_COLLATE); -#ifndef Q_OS_QNX +#if !defined(Q_OS_QNX) && !defined(Q_OS_INTEGRITY) CASE(LC_MEASUREMENT); #endif #undef CASE |