Mercurial > octave
changeset 22456:8924139b4f21
fix test for qscintilla (bug #49018)
* acinclude.m4 (OCTAVE_CHECK_QT_VERSION): Check for QsciLexerCPP
QsciAPIs instead of QsciLexerSQL.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 09 Sep 2016 12:17:23 -0400 |
| parents | 8445f67a8123 |
| children | ae58225940da |
| files | m4/acinclude.m4 |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/m4/acinclude.m4 Thu Sep 08 18:50:43 2016 -0700 +++ b/m4/acinclude.m4 Fri Sep 09 12:17:23 2016 -0400 @@ -1507,9 +1507,11 @@ for octave_qscintilla_try in $octave_qscintilla_libnames; do LIBS="$QT_LIBS -l$octave_qscintilla_try" AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include <Qsci/qscilexersql.h> + #include <Qsci/qsciapis.h> + #include <Qsci/qscilexercpp.h> ]], [[ - QsciLexerSQL sqlLexer(0); + QsciLexer *lexer = new QsciLexerCPP (); + QsciAPIs *lexer_apis = new QsciAPIs (lexer); ]])], octave_cv_lib_qscintilla="-l$octave_qscintilla_try", octave_cv_lib_qscintilla=no)