summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weghorn <m.weghorn@posteo.de>2022-05-23 12:51:26 +0200
committerMichael Weghorn <m.weghorn@posteo.de>2022-05-23 17:40:21 +0200
commit9adc0e9d381e8469ac2fe67d1fb09dfddad225d8 (patch)
tree1ea4aea80efd71338fec744a5ea310af8350beea
parent72582e9fb3d634a28c1466126bbe8e36fc00b446 (diff)
qt6 configure: Consider 'qmake6' when searching Qt 6 qmake
Debian testing/unstable provides a `/usr/bin/qmake6`. Change-Id: I3dba55fc1a2d5667d9fc16aecacf8db6119ced02 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134813 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
-rw-r--r--configure.ac2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index f75582843689..ee9fe810377c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13027,7 +13027,7 @@ then
if test -n "$QT6DIR"; then
AC_PATH_PROG(QMAKE6, [qmake], no, [$QT6DIR/bin])
else
- AC_PATH_PROGS(QMAKE6, [qmake-qt6 qmake], no)
+ AC_PATH_PROGS(QMAKE6, [qmake-qt6 qmake6 qmake], no)
fi
if test "$QMAKE6" = "no"; then
AC_MSG_ERROR([Qmake not found. Please specify the root of your Qt6 installation by exporting QT6DIR before running "configure".])