summaryrefslogtreecommitdiffstats
path: root/src/sql/kernel/qsqldriverplugin.cpp
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2021-07-30 12:38:20 -0700
committerThiago Macieira <thiago.macieira@intel.com>2021-08-02 17:40:12 -0700
commit94de5f9b25e1816039885c765e2a5b312f7daa7e (patch)
treee7a4b696ce946c48d51261460acdfc5a8526b52b /src/sql/kernel/qsqldriverplugin.cpp
parent4d2e574fb0e5f084a39edb380c254465467cfcc2 (diff)
QString::localeAwareCompare: adapt to QLocale::setDefault() being calledHEADdev
Because we're using a thread-specific global static, we need to recreate the QCollator type every time setDefault() is called. Since one is stored per-thread, we simply increment a generational counter and check that the next time that QString::localeAwareCompare is called in each thread. The issue was introduced on f6425da424b1a0d5927ee56fa657a9b31ca5afd1 (5.12) even though we were supposed to be using QCollator since commit 5279134935e858e6fa8565c936b17e88d7bded50 (5.3). Fixes: QTBUG-95050 Pick-to: 6.2 Change-Id: I7e0b82c2d2fe464082d8fffd1696a8c9f74e5b30 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/sql/kernel/qsqldriverplugin.cpp')
0 files changed, 0 insertions, 0 deletions