anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-24 13:48:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correct moc compiler version extractor regex for patch level greater 9.

Browse Source 
(cherry picked from commit c93c94fd22)
This commit is contained in:
Stephan Witt 2021-07-16 18:12:33 +02:00 committed by Jean-Marc Lasgouttes
parent 2f01ab6410
commit b7403de38c
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/qt4.m4
View File

@ -208,7 +208,7 @@ AC_DEFUN([QT_DO_IT_ALL],
QT_FIND_TOOL([QT_RCC], [rcc])
dnl Safety check
mocqtver=`$QT_MOC -v 2>&1 | sed -e 's/.*\([[0-9]]\.[[0-9]]*\.[[0-9]]\).*/\1/'`
mocqtver=`$QT_MOC -v 2>&1 | sed -e 's/.*\([[0-9]]\.[[0-9]]*\.[[0-9]]*\).*/\1/'`
if test "x$mocqtver" != "x$QTLIB_VERSION"; then
LYX_WARNING([The found moc compiler is for Qt $mocqtver but the Qt library version is $QTLIB_VERSION.])
fi

2
status.23x
View File

@ -97,3 +97,5 @@ What's new
- update included boost library to version 1.75.0.
- fix warning when configuring with Qt 5.15.1x.