mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
Fix configure with Qt 6.1
Since Qt 6.1 the moc, rcc, and uic compilers are not installed in the bin dir anymore. We ask qmake for their location and record them with full path so that it is not necessary thinkering with the PATH variable.
This commit is contained in:
parent
a9c6fb0c19
commit
f60b23cbc1
@ -80,7 +80,9 @@ AC_DEFUN([QT_FIND_TOOL],
|
|||||||
fi
|
fi
|
||||||
qt_ext="qt$qt_major"
|
qt_ext="qt$qt_major"
|
||||||
|
|
||||||
if test -n "$qt_cv_bin" ; then
|
if test -n "$qt_cv_libexec" ; then
|
||||||
|
AC_PATH_PROGS($1, [$2], [], $qt_cv_libexec)
|
||||||
|
elif test -n "$qt_cv_bin" ; then
|
||||||
AC_PATH_PROGS($1, [$2], [], $qt_cv_bin)
|
AC_PATH_PROGS($1, [$2], [], $qt_cv_bin)
|
||||||
elif qtchooser -l 2>/dev/null | grep -q ^$qt_ext\$ >/dev/null ; then
|
elif qtchooser -l 2>/dev/null | grep -q ^$qt_ext\$ >/dev/null ; then
|
||||||
AC_PATH_PROG(qtc_path, qtchooser, [], [$PATH])
|
AC_PATH_PROG(qtc_path, qtchooser, [], [$PATH])
|
||||||
@ -404,6 +406,7 @@ AC_DEFUN([QT6_QMAKE_CONFIG],
|
|||||||
AC_MSG_CHECKING([for Qt6])
|
AC_MSG_CHECKING([for Qt6])
|
||||||
qtver=`$QT_QMAKE -v | grep -o "Qt version ."`
|
qtver=`$QT_QMAKE -v | grep -o "Qt version ."`
|
||||||
if test "$qtver" = "Qt version 6"; then
|
if test "$qtver" = "Qt version 6"; then
|
||||||
|
qt_cv_libexec=`$QT_QMAKE -query QT_INSTALL_LIBEXECS`
|
||||||
dnl Use a .pro file for getting qmake's variables
|
dnl Use a .pro file for getting qmake's variables
|
||||||
lyx_test_qt_dir=`mktemp -d`
|
lyx_test_qt_dir=`mktemp -d`
|
||||||
lyx_test_qt_pro="$lyx_test_qt_dir/test.pro"
|
lyx_test_qt_pro="$lyx_test_qt_dir/test.pro"
|
||||||
|
Loading…
Reference in New Issue
Block a user