From 68aa7ba7397c4ecb28391264cc4e15c54d743374 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Mon, 1 Mar 2021 21:50:12 +0200 Subject: [PATCH 25/25] Autodetect moc command with name of format moc-qt See osdn #41674 Signed-off-by: Marko Lindqvist --- m4/qt5.m4 | 3 ++- m4/qt6.m4 | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/m4/qt5.m4 b/m4/qt5.m4 index 044c721463..23e844e145 100644 --- a/m4/qt5.m4 +++ b/m4/qt5.m4 @@ -172,7 +172,8 @@ AC_DEFUN([FC_QT5_VALIDATE_MOC], [ AS_IF([test "x$MOCCMD" = "x"], [FC_QT5_TRY_MOC([moc], [FC_QT5_TRY_MOC([qtchooser -run-tool=moc -qt=5], - [MOCCMD=""])])], + [FC_QT5_TRY_MOC([moc-qt5], + [MOCCMD=""])])])], [FC_QT5_TRY_MOC([$MOCCMD], AC_MSG_ERROR(["MOCCMD set to a bad value ($MOCCMD)"]))]) diff --git a/m4/qt6.m4 b/m4/qt6.m4 index 43a919e640..d5d747a865 100644 --- a/m4/qt6.m4 +++ b/m4/qt6.m4 @@ -169,7 +169,8 @@ AC_DEFUN([FC_QT6_VALIDATE_MOC], [ AS_IF([test "x$MOCCMD" = "x"], [FC_QT6_TRY_MOC([moc], [FC_QT6_TRY_MOC([qtchooser -run-tool=moc -qt=6], - [MOCCMD=""])])], + [FC_QT6_TRY_MOC([moc-qt6], + [MOCCMD=""])])])], [FC_QT6_TRY_MOC([$MOCCMD], AC_MSG_ERROR(["MOCCMD set to a bad value ($MOCCMD)"]))]) -- 2.30.1