Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-10-22 07:21:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Qt6 detection: redirect qmake's STDERR to config.log

Browse Source 
See #3649
This commit is contained in:
Moritz Bunkus 2023-12-09 11:23:27 +01:00
parent d202f6156a
commit c86e5d1250
No known key found for this signature in database
GPG Key ID: 74AF00ADF2E32C85
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ac/qt6.m4
View File

@ -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"