Mercurial > octave

diff configure.ac @ 22251:d6948923dc9b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Check for Qt 5, then Qt 4. * configure.ac (QT_VERSIONS): Set default to "5 4".
author John W. Eaton <jwe@octave.org>
date Wed, 10 Aug 2016 04:14:02 -0400
parents 66dd260512a4
children 945e7f9c11ff
line wrap: on
line diff
--- a/configure.ac	Wed Aug 10 03:54:42 2016 -0400
+++ b/configure.ac	Wed Aug 10 04:14:02 2016 -0400
@@ -1752,8 +1752,7 @@
 
 ### GUI/Qt related tests.
 
-## Change to "5 4" once Octave works with both versions.
-QT_VERSIONS="4"
+QT_VERSIONS="5 4"
 check_qt=yes
 
 AC_ARG_WITH([qt],