File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -107,9 +107,13 @@ function gnu_fn {
107107# qt.cpp
108108function 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
You can’t perform that action at this time.
0 commit comments