Account for Qt 5.10

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

(cherry picked from commit 6253cc4c51e4e36125c33a8c427e27493435ddc8)

diff --git a/config/qt4.m4 b/config/qt4.m4
index 1cf557d637239bd9ce3fb0df98904c9e283fde6b..f53f243df09042f586797429941a30292014727d 100644 (file)
--- 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

diff --git a/status.23x b/status.23x
index 82b21ecd9ebbe75ac0a24a46d40c23e694b9b588..9e76c76cba8953e319de5a14ca3f877bb45e57fe 100644 (file)
--- a/status.23x
+++ b/status.23x
@@ -95,6 +95,8 @@ What's new
 - Support new hunspell C++ ABI if LyX is built against hunspell >= 1.5
   (bug 10547).
 
+- Fix spurious warning when compiling with Qt 5.10.
+
 
 
 ** Bug fixes: