Mercurial > octave
changeset 31742:c0aad3536476
* acinclude.m4: Update comment about supporting multiple Qt versions.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 17 Jan 2023 09:02:50 -0500 |
| parents | e31eae72aecd |
| children | 9f7cb0e647be |
| files | m4/acinclude.m4 |
| diffstat | 1 files changed, 12 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/m4/acinclude.m4 Sat Jan 14 13:06:18 2023 -0500 +++ b/m4/acinclude.m4 Tue Jan 17 09:02:50 2023 -0500 @@ -1888,12 +1888,18 @@ have_qt_version=$ver break elif test -n "$QT_MODULES_AVAILABLE"; then - ## If some modules were found for $ver, then warn about possible - ## incomplete or broken Qt installation instead of checking for - ## next version in the list. Don't attempt a similar check for - ## tools here because Qt4 and Qt5 tools may be installed with - ## the same name so determining whether there is a mix of versions - ## will require more work than just looking which tools are installed. + ## We currently only support Qt5, but previously, when it was + ## possible to build Octave with either qt4 or Qt5 and we detected + ## only some modules available for a particular version $ver, then + ## we warned about a possible incomplete or broken Qt installation + ## instead of checking for next version in the list. We did not + ## attempt a similar check for tools here because version-specific + ## Qt tools may be installed with the same name so determining + ## whether there is a mix of versions requires more work than just + ## looking which tools are installed. + ## + ## NOTE: Leave this logic in place because it may be needed again + ## if/when we begin supporting both Qt5 and Qt6 warn_qt_modules="Your installation of Qt version $ver appears incomplete or broken in some way. Fix that or use --with-qt=VER to use another version." break fi