Mercurial > mxe-octave

changeset 7131:01a3db7f1f49

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge release to default.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 28 Mar 2024 15:37:09 +0100
parents e4601a57e680 (current diff) 889fdc83694c (diff)
children 91a699a47331
files
diffstat 1 files changed, 1 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Thu Mar 28 08:05:07 2024 -0400
+++ b/configure.ac	Thu Mar 28 15:37:09 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],