summaryrefslogtreecommitdiffstats
path: root/src/sql/kernel
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2022-10-31 15:25:55 +0100
committerEdward Welbourne <edward.welbourne@qt.io>2023-01-24 19:48:15 +0100
commit10117f78d72498e19683e69b439ca7c931532261 (patch)
tree80d8c8bd42e303ccb216b68a2acf786ae431e3ae /src/sql/kernel
parent1cd7bdeceb4e117976a8544021ab71125f982b04 (diff)
Restore Android-conditioning on nl_langinfo() definition
QCoreApplicationPrivate::initLocale()'s check that the selected locale is UTF-8-based was added with an initial work-around for Android, specific to NDK <= 15, which Qt 5.15 did not support. Later the Android-specific #if-ery was changed to test for Qt taking UTF-8 for granted, for a given reason having to do with QNX; and later the #if-ery for that was removed. However, we still support versions of Android that lack nl_langinfo(), so restore the Android #if-ery. It presently seems that NDK 26 (Android 8) does contain nl_langinfo(), so we should be able to drop the nl_langinfo() kludge for this and later versions. That way we'll at least use the real nl_langinfo() where we have it. In the process, fix the indentation of #if-ery. Pick-to: 6.5 6.4 6.2 Change-Id: Ie9e83c3397955c24cea1e9a9ff6bb0187e47dda2 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/sql/kernel')
0 files changed, 0 insertions, 0 deletions