From b7403de38cff46837ab3886396dab1480eed127c Mon Sep 17 00:00:00 2001 From: Stephan Witt Date: Fri, 16 Jul 2021 18:12:33 +0200 Subject: [PATCH] Correct moc compiler version extractor regex for patch level greater 9. (cherry picked from commit c93c94fd22b30841e3d36fc8fc583a70091cc72f) --- config/qt4.m4 | 2 +- status.23x | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/config/qt4.m4 b/config/qt4.m4 index 0d77b8c7ea..1313c61e79 100644 --- a/config/qt4.m4 +++ b/config/qt4.m4 @@ -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 diff --git a/status.23x b/status.23x index ef768a1e85..2607d611c0 100644 --- a/status.23x +++ b/status.23x @@ -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. +