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

Account for Qt 5.10

Browse Source 
Fix regular sed expression in order to catch a second digit in the
Qt minor version number.

(cherry picked from commit 6253cc4c51)
This commit is contained in:
Enrico Forestieri 2018-01-05 19:27:24 +01:00
parent b80e9503fe
commit 03b5a0800a
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

@ -211,7 +211,7 @@ AC_DEFUN([QT_DO_IT_ALL],
QT_FIND_TOOL([QT_RCC], [rcc]) QT_FIND_TOOL([QT_RCC], [rcc])
dnl Safety check 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 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.]) LYX_WARNING([The found moc compiler is for Qt $mocqtver but the Qt library version is $QTLIB_VERSION.])
fi fi

2
status.23x
View File

@ -95,6 +95,8 @@ What's new
- Support new hunspell C++ ABI if LyX is built against hunspell >= 1.5 - Support new hunspell C++ ABI if LyX is built against hunspell >= 1.5
(bug 10547). (bug 10547).
- Fix spurious warning when compiling with Qt 5.10.
** Bug fixes: ** Bug fixes: