diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2022-08-10 11:49:59 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2022-09-07 15:29:39 +0200 |
| commit | ebe9aca90004d47b0ea104d8e730b09f1c78c495 (patch) | |
| tree | f619307d16dbb575afb9049394fb16516e94627f /tests/auto/corelib | |
| parent | 753bfdf6a1336cc296e5fc8175aedd000c2cc013 (diff) | |
Simplify system locale management
Have QSystemLocale manage a stack, so that tests can install an
over-ride for the actual system-specific one reliably and restore the
system-specific one when finished. Leave the QSystemLocaleSingleton
out of the stack, all the same. In the process, mark the QDoc comments
for QSystemLocale all as \internal, since this is not public API.
Change-Id: I8faed49780215e42f32be10cf936c32bb46105bf
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'tests/auto/corelib')
| -rw-r--r-- | tests/auto/corelib/text/qlocale/tst_qlocale.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp index cd0004c341..f0fef7093a 100644 --- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp +++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp @@ -3258,9 +3258,6 @@ private: void tst_QLocale::systemLocale_data() { -#ifdef Q_OS_ANDROID - QSKIP("Android already has a QSystemLocale installed, we can't override it"); -#endif // Test uses MySystemLocale, so is platform-independent. QTest::addColumn<QString>("name"); QTest::addColumn<QLocale::Language>("language"); |