anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid bogus warnings when configuring for Qt6

Browse Source 
Recent versions of qmake complain loudly when the locale
does not explicitly specify the utf8 codeset. Specifically,
the configure script exports LC_ALL=C and that implies the
ascii codeset. Previously, this was silently changed to utf8,
whereas now we get a warning for each qmake invocation.
So, explicitly set utf8 before calling qmake.
This commit is contained in:
Enrico Forestieri 2024-07-03 21:02:51 +02:00
parent e6a0bfb43d
commit 94004da71f
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/qt.m4
View File

@ -379,6 +379,10 @@ AC_DEFUN([QT6_QMAKE_CONFIG],
[ [
dnl Use first suitable qmake in PATH dnl Use first suitable qmake in PATH
AC_CHECK_PROGS([QT_QMAKE], [qmake-qt6 qmake6], [qmake], $PATH) AC_CHECK_PROGS([QT_QMAKE], [qmake-qt6 qmake6], [qmake], $PATH)
case ${host} in
*mingw*) ;;
*) QT_QMAKE="env LC_ALL=C.UTF-8 $QT_QMAKE" ;;
esac
AC_MSG_CHECKING([for Qt6]) AC_MSG_CHECKING([for Qt6])
qtver=`$QT_QMAKE -v | grep -o "Qt version ."` qtver=`$QT_QMAKE -v | grep -o "Qt version ."`
if test "$qtver" = "Qt version 6"; then if test "$qtver" = "Qt version 6"; then

1
status.24x
View File

@ -35,6 +35,7 @@ What's new
* BUILD/INSTALLATION * BUILD/INSTALLATION
- Avoid bogus warnings when configuring for Qt6.