changeset 7130:889fdc83694c release

configure: Always default to Qt6. * configure.ac: Remove condition that set the default version of Qt to Qt5 when building with a release tarball of Octave. I.e., the default is now Qt6 unconditionally. It can still be overridden with `--enable-qt=5`.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 28 Mar 2024 15:36:42 +0100
parents 80fbbf281737
children 01a3db7f1f49 cafa182c2afb
files configure.ac
diffstat 1 files changed, 1 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Sun Mar 24 17:27:41 2024 -0400
+++ b/configure.ac	Thu Mar 28 15:36:42 2024 +0100
@@ -360,12 +360,7 @@
    esac], [ENABLE_DEVEL_TOOLS=no])
 AC_SUBST(ENABLE_DEVEL_TOOLS)
 
-# FIXME: Adjust this condition for the release candidate of Octave 9.
-if test "$ENABLE_OCTAVE" = "release-"; then
-  default_qt=5
-else
-  default_qt=6
-fi
+default_qt=6
 
 AC_ARG_ENABLE([qt],
   [AS_HELP_STRING([--enable-qt=VER],