Fix tst_qcollator run time issue on INTEGRITY device
By GHS the only C locale is supported. Task-number: QTBUG-99123 Change-Id: I3d89f1b2d9eb7f77b75e13a5ca65cebc24538890 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit 2cb5e4bd4308f6cc7cee5db0d7f04341403bd917)
This commit is contained in:
parent
fe7f9898b9
commit
bce4329f60
@ -75,8 +75,8 @@ void tst_QCollator::basics()
|
||||
QCOMPARE(c3.locale(), de_AT);
|
||||
|
||||
// posix implementation supports only C and default locale,
|
||||
// so update it for Android build
|
||||
#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED)
|
||||
// so update it for Android and INTEGRITY builds
|
||||
#if (defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED)) || defined(Q_OS_INTEGRITY)
|
||||
c3.setLocale(QLocale());
|
||||
#endif
|
||||
QCollatorSortKey key1 = c3.sortKey("test");
|
||||
@ -110,8 +110,8 @@ void tst_QCollator::moveSemantics()
|
||||
|
||||
// test QCollatorSortKey move assignment
|
||||
// posix implementation supports only C and default locale,
|
||||
// so update it for Android build
|
||||
#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED)
|
||||
// so update it for Android and INTEGRITY builds
|
||||
#if (defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED)) || defined(Q_OS_INTEGRITY)
|
||||
c1.setLocale(QLocale());
|
||||
#endif
|
||||
QCollatorSortKey key1 = c1.sortKey("1");
|
||||
@ -281,7 +281,7 @@ void tst_QCollator::compare()
|
||||
return compared < 0 ? -1 : compared > 0 ? 1 : 0;
|
||||
};
|
||||
|
||||
#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED)
|
||||
#if (defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED)) || defined(Q_OS_INTEGRITY)
|
||||
if (collator.locale() != QLocale::c() && collator.locale() != QLocale::system().collation())
|
||||
QSKIP("POSIX implementation of collation only supports C and system collation locales");
|
||||
#endif
|
||||
|
Loading…
x
Reference in New Issue
Block a user