From c86e5d1250e3b0775292a4730af6ec68eae38077 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <mo@bunkus.online>
Date: Sat, 9 Dec 2023 11:23:27 +0100
Subject: [PATCH] Qt6 detection: redirect qmake's `STDERR` to `config.log`

See #3649
---
 ac/qt6.m4 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ac/qt6.m4 b/ac/qt6.m4
index 521115075..417fc2cdb 100644
--- a/ac/qt6.m4
+++ b/ac/qt6.m4
@@ -23,7 +23,7 @@ check_qt6() {
   fi
 
   QMAKE_SPEC=""
-  if "$QMAKE6" -query | grep -F -q "QMAKE_XSPEC:linux-g++"; then
+  if "$QMAKE6" -query 2>&5 | grep -F -q "QMAKE_XSPEC:linux-g++"; then
     if test x"$COMPILER_TYPE" = xclang; then
       QMAKE_SPEC="-spec linux-clang"
     else
@@ -66,7 +66,7 @@ EOT
   old_wd="$PWD"
   cd "$qmake_dir"
 
-  "$QMAKE6" -makefile -nocache $QMAKE_SPEC configure_non_gui.pro > /dev/null
+  "$QMAKE6" -makefile -nocache $QMAKE_SPEC configure_non_gui.pro 2>&5
   result=$?
 
   if test $result = 0; then
@@ -90,7 +90,7 @@ HEADERS = configure.h
 SOURCES = configure.cpp
 EOT
 
-    "$QMAKE6" -makefile -nocache $QMAKE_SPEC configure.pro > /dev/null 2> /dev/null
+    "$QMAKE6" -makefile -nocache $QMAKE_SPEC configure.pro 2>&5
     result2=$?
 
     if test $result2 != 0; then
@@ -115,7 +115,7 @@ HEADERS = configure.h
 SOURCES = configure.cpp
 EOT
 
-  "$QMAKE6" -makefile -nocache $QMAKE_SPEC configure.pro > /dev/null
+  "$QMAKE6" -makefile -nocache $QMAKE_SPEC configure.pro 2>&5
   result2=$?
 
   if test $result2 = 0; then
@@ -128,7 +128,7 @@ EOT
     fi
   fi
 
-  "$QMAKE6" -query $QMAKE_SPEC > "$qmake_dir/configure.properties"
+  "$QMAKE6" -query $QMAKE_SPEC > "$qmake_dir/configure.properties" 2>&5
   result3=$?
 
   cd "$old_wd"