On Sun, Apr 15, 2018 at 12:55:48PM -0400, Richard Kimberly Heck wrote: > On 04/15/2018 05:46 AM, Jürgen Spitzmüller wrote: > > Am Freitag, den 05.01.2018, 19:29 +0100 schrieb Enrico Forestieri: > >> commit 6253cc4c51e4e36125c33a8c427e27493435ddc8 > >> Author: Enrico Forestieri > >> Date: Fri Jan 5 19:27:24 2018 +0100 > >> > >> Account for Qt 5.10 > >> > >> Fix regular sed expression in order to catch a second digit in > >> the > >> Qt minor version number. > >> --- > >> config/qt4.m4 | 2 +- > >> 1 files changed, 1 insertions(+), 1 deletions(-) > >> > >> diff --git a/config/qt4.m4 b/config/qt4.m4 > >> index 1cf557d..f53f243 100644 > >> --- a/config/qt4.m4 > >> +++ b/config/qt4.m4 > >> @@ -211,7 +211,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 > > Can we please backport this one? > > Sure. Not sure why it wasn't done earlier....
Advertising
Sorry. I forgot about that. Done at 03b5a080. -- Enrico
