1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

locale: INTEGRITY does not define LC_MEASUREMENTS

Browse Source 
- 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>
This commit is contained in:
Tatiana Borisova 2021-09-21 15:47:01 +03:00 committed by Qt Cherry-pick Bot
parent 5c7b3db32b
commit ee052db1c1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/shared/localechange.h
View File

@ -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