aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2023-02-08 06:34:23 +0000
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-02-08 15:50:04 +0000
commitdb15f412d5582fc3be4920324c4559ba3c59f472 (patch)
tree542737b3c7160adf5b9d37318c3deebd74ca2885
parent9c7b1136f7c0bb74d4e157b1ed34e17e0fcb87ea (diff)
default-qt-envs: use UTF-8 locale
Qt warns if current locale is not UTF-8. Add configuration to use en_US.UTF-8 as the default locale. Fixes: QTBUG-110884 Change-Id: I18c5d2bc68ddbbda81c3470ede8f2c98baaa9a60 Reviewed-by: Ari Parkkila <ari.parkkila@qt.io> (cherry picked from commit 0aa8cc0a6322dba5fe93c1c2ba3111c741b4cc91) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs.bb3
-rw-r--r--meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs/locale.conf1
2 files changed, 4 insertions, 0 deletions
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs.bb
index 2b678a52..f1164302 100644
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs.bb
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs.bb
@@ -36,6 +36,7 @@ inherit systemd
SRC_URI += "\
file://defaults \
file://b2qt.service \
+ file://locale.conf \
"
QT_QPA_PLATFORM ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'eglfs', 'linuxfb', d)}"
@@ -51,6 +52,8 @@ do_install:append() {
install -m 0755 -d ${D}${systemd_unitdir}/system
install -m 0644 ${WORKDIR}/b2qt.service ${D}${systemd_unitdir}/system/
+ install -m 0755 ${WORKDIR}/locale.conf ${D}${sysconfdir}
+
# loginctl enable-linger root
install -d ${D}/var/lib/systemd/linger
touch ${D}/var/lib/systemd/linger/root
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs/locale.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs/locale.conf
new file mode 100644
index 00000000..01ec548f
--- /dev/null
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs/locale.conf
@@ -0,0 +1 @@
+LANG=en_US.UTF-8