Mercurial > octave-dspies

comparison m4/acinclude.m4 @ 18973:625e3bb65885 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't require Qt 4.7 (bug #42657) * acinclude.m4 (OCTAVE_CHECK_QFONT_FORCE_INTEGER_METRICS): New macro. * configure.ac: Use it. * unix/TerminalView.cpp (TerminalView::setVTFont): Only use QFont::ForceIntegerMetrics if it is available.
author John W. Eaton <jwe@octave.org>
date Tue, 01 Jul 2014 15:56:00 -0400
parents 5e72998000fb
children d8abf813c69f
comparison
equal deleted inserted replaced
18960:a5add7b660ac 18973:625e3bb65885
378 AC_LANG_POP(C++) 378 AC_LANG_POP(C++)
379 ]) 379 ])
380 if test $octave_cv_decl_qfont_monospace = yes; then 380 if test $octave_cv_decl_qfont_monospace = yes; then
381 AC_DEFINE(HAVE_QFONT_MONOSPACE, 1, 381 AC_DEFINE(HAVE_QFONT_MONOSPACE, 1,
382 [Define to 1 if Qt provides QFont::Monospace.]) 382 [Define to 1 if Qt provides QFont::Monospace.])
383 fi
384 ])
385 dnl
386 dnl Check whether Qt provides QFont::ForceIntegerMetrics
387 dnl
388 AC_DEFUN([OCTAVE_CHECK_QFONT_FORCE_INTEGER_METRICS], [
389 AC_CACHE_CHECK([whether Qt provides QFont::ForceIntegerMetrics],
390 [octave_cv_decl_qfont_force_integer_metrics],
391 [AC_LANG_PUSH(C++)
392 ac_octave_save_CPPFLAGS="$CPPFLAGS"
393 CPPFLAGS="$QT_CPPFLAGS $CPPFLAGS"
394 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
395 #include <QFont>
396 ]], [[
397 QFont::StyleStrategy strategy = QFont::ForceIntegerMetrics;
398 ]])],
399 octave_cv_decl_qfont_force_integer_metrics=yes,
400 octave_cv_decl_qfont_force_integer_metrics=no)
401 CPPFLAGS="$ac_octave_save_CPPFLAGS"
402 AC_LANG_POP(C++)
403 ])
404 if test $octave_cv_decl_qfont_force_integer_metrics = yes; then
405 AC_DEFINE(HAVE_QFONT_FORCE_INTEGER_METRICS, 1,
406 [Define to 1 if Qt provides QFont::ForceIntegerMetrics.])
383 fi 407 fi
384 ]) 408 ])
385 dnl 409 dnl
386 dnl Check whether Qscintilla SetPlaceholderText function exists. 410 dnl Check whether Qscintilla SetPlaceholderText function exists.
387 dnl FIXME: This test uses a version number. It potentially could 411 dnl FIXME: This test uses a version number. It potentially could