Skip to content

Commit 8d74e3d

Browse files
committed
test/cli/runtests.sh: added support for Qt6 package config
1 parent b2a6fb5 commit 8d74e3d

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

test/cfg/runtests.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,13 @@ function gnu_fn {
107107
# qt.cpp
108108
function qt_fn {
109109
if [ $HAS_PKG_CONFIG -eq 1 ]; then
110-
QTCONFIG=$(get_pkg_config_cflags Qt5Core Qt5Test Qt5Gui)
110+
QTCONFIG=$(get_pkg_config_cflags Qt6Core Qt6Test Qt6Gui)
111+
QTBUILDCONFIG=$(pkg-config --variable=qt_config Qt6Core Qt6Test Qt6Gui)
112+
if [ -z "$QTCONFIG" ]; then
113+
QTCONFIG=$(get_pkg_config_cflags Qt5Core Qt5Test Qt5Gui)
114+
QTBUILDCONFIG=$(pkg-config --variable=qt_config Qt5Core Qt5Test Qt5Gui)
115+
fi
111116
if [ -n "$QTCONFIG" ]; then
112-
QTBUILDCONFIG=$(pkg-config --variable=qt_config Qt5Core Qt5Test Qt5Gui)
113117
[[ $QTBUILDCONFIG =~ (^|[[:space:]])reduce_relocations($|[[:space:]]) ]] && QTCONFIG="${QTCONFIG} -fPIC"
114118
# TODO: get rid of the error enabling/disabling?
115119
set +e

0 commit comments

Comments
 (0)