Mercurial > octave

comparison m4/acinclude.m4 @ 32051:17a09d2bbe0f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gui: Remove usage of QTextCodec from some more places. * libgui/src/gui-preference.h: Remove unused header. * libgui/src/octave-qobject.cc: Include header only if function from it are used. * m4/acinclude.m4: Do not require Qt6Core5Compat on platforms that don't need it.
author Markus Mützel <markus.muetzel@gmx.de>
date Sun, 23 Apr 2023 11:08:16 +0200
parents 1c99c8f020f7
children 9cb43336c3b3
comparison
equal deleted inserted replaced
32050:c00d842608f7 32051:17a09d2bbe0f
1979 case "$qt_version" in 1979 case "$qt_version" in
1980 5) 1980 5)
1981 QT_MODULES="Qt5Core Qt5Gui Qt5Help Qt5Network Qt5OpenGL Qt5PrintSupport Qt5Xml" 1981 QT_MODULES="Qt5Core Qt5Gui Qt5Help Qt5Network Qt5OpenGL Qt5PrintSupport Qt5Xml"
1982 ;; 1982 ;;
1983 6) 1983 6)
1984 # FIXME: Remove Qt6Core5Compat when we no longer rely on classes that 1984 QT_MODULES="Qt6Core Qt6Gui Qt6Help Qt6Network Qt6OpenGL Qt6OpenGLWidgets Qt6PrintSupport Qt6Xml"
1985 # have been removed in Qt6: 1985 case $host_os in
1986 # https://www.qt.io/blog/porting-from-qt-5-to-qt-6-using-qt5compat-library 1986 mingw* | msdosmsvc*)
1987 QT_MODULES="Qt6Core Qt6Core5Compat Qt6Gui Qt6Help Qt6Network Qt6OpenGL Qt6OpenGLWidgets Qt6PrintSupport Qt6Xml" 1987 ;;
1988 *)
1989 # FIXME: Remove Qt6Core5Compat when we no longer rely on classes that
1990 # have been removed in Qt6:
1991 # https://www.qt.io/blog/porting-from-qt-5-to-qt-6-using-qt5compat-library
1992 # It is still needed for the terminal implementation in
1993 # libgui/qterminal/libqterminal/unix
1994 QT_MODULES="$QT_MODULES Qt6Core5Compat"
1995 ;;
1996 esac
1988 ;; 1997 ;;
1989 *) 1998 *)
1990 AC_MSG_ERROR([Unrecognized Qt version $qt_version]) 1999 AC_MSG_ERROR([Unrecognized Qt version $qt_version])
1991 ;; 2000 ;;
1992 esac 2001 esac