Commit 9ab73c0
Ethan A Merritt
configure: allow explicit --with-qt=qt5
1 parent e458b88 commit 9ab73c0
1 file changed
Lines changed: 6 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1073,8 +1073,11 @@ if test "${enable_qt}" = yes ; then | |||
| 1073 | 1073 | fi | |
| 1074 | 1074 | ||
| 1075 | 1075 | if test "x${with_qt}" != "xqt4"; then | |
| 1076 | - AC_MSG_CHECKING([Checking for Qt6 support libraries]) | ||
| 1077 | - PKG_CHECK_MODULES_NOFAIL(QT, [Qt6Core Qt6Gui Qt6Network Qt6Svg Qt6PrintSupport Qt6Core5Compat]) | ||
| 1076 | + pkg_failed="not_tried" | ||
| 1077 | + if test "x${with_qt}" != "xqt5"; then | ||
| 1078 | + AC_MSG_CHECKING([Checking for Qt6 support libraries]) | ||
| 1079 | + PKG_CHECK_MODULES_NOFAIL(QT, [Qt6Core Qt6Gui Qt6Network Qt6Svg Qt6PrintSupport Qt6Core5Compat]) | ||
| 1080 | + fi | ||
| 1078 | 1081 | if test $pkg_failed = no; then | |
| 1079 | 1082 | QT6LOC=`$PKG_CONFIG --variable=host_bins Qt6Core` | |
| 1080 | 1083 | if test "x${QT6LOC}" != "x"; then | |
@@ -1386,7 +1389,7 @@ if test "$enable_qt_ok" = yes; then | |||
| 1386 | 1389 | AC_MSG_RESULT([ Qt : yes (qt6)]) | |
| 1387 | 1390 | fi | |
| 1388 | 1391 | else | |
| 1389 | - AC_MSG_RESULT([ Qt : no (use --with-qt or --with-qt=qt4 to enable]) | ||
| 1392 | + AC_MSG_RESULT([ Qt : no (use --with-qt or --with-qt=qt4 or --with-qt=qt5 to enable]) | ||
| 1390 | 1393 | fi | |
| 1391 | 1394 | ||
| 1392 | 1395 | AC_MSG_RESULT([]) | |
0 commit comments