Mercurial > octave

comparison m4/acinclude.m4 @ 29053:0678fdb81efc stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid deprecated QHelpEngine::linksForIdentifier function * documentation.cc (void documentation::load_ref): If it is available, call QHelpEngine::documentsForIdentifier instead of QHelpEngine::linksForIdentifier. Adapt to different type of returned object. * acinclude.m4 (OCTAVE_CHECK_FUNC_QHELPENGINE_DOCUMENTSFORIDENTIFIER): New macro. (OCTAVE_CHECK_QT_VERSION): Use it.
author John W. Eaton <jwe@octave.org>
date Thu, 12 Nov 2020 01:21:29 -0500
parents 461bd8b9ce91
children 226df400639c c6796a1c35b2
comparison
equal deleted inserted replaced
29052:6ecc75589cbc 29053:0678fdb81efc
825 AC_LANG_POP(C++) 825 AC_LANG_POP(C++)
826 ]) 826 ])
827 if test $octave_cv_func_qtabwidget_setmovable = yes; then 827 if test $octave_cv_func_qtabwidget_setmovable = yes; then
828 AC_DEFINE(HAVE_QTABWIDGET_SETMOVABLE, 1, 828 AC_DEFINE(HAVE_QTABWIDGET_SETMOVABLE, 1,
829 [Define to 1 if you have the `QTabWidget::setMovable' member function.]) 829 [Define to 1 if you have the `QTabWidget::setMovable' member function.])
830 fi
831 ])
832 dnl
833 dnl Check whether the Qt class QHelpEngine has the documentsForIdentifier
834 dnl function. dnl This member function was introduced in Qt 5.15.
835 dnl
836 AC_DEFUN([OCTAVE_CHECK_FUNC_QHELPENGINE_DOCUMENTSFORIDENTIFIER], [
837 AC_CACHE_CHECK([for QHelpEngine::documentsForIdentifier in <QHelpEngine>],
838 [octave_cv_func_qhelpengine_documentsforidentifier],
839 [AC_LANG_PUSH(C++)
840 ac_octave_save_CPPFLAGS="$CPPFLAGS"
841 ac_octave_save_CXXFLAGS="$CXXFLAGS"
842 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
843 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
844 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
845 #include <QHelpEngine>
846 #include <QHelpLink>
847 #include <QList>
848 #include <QString>
849 #include <QUrl>
850 ]], [[
851 QString collection_file;
852 QHelpEngine eng (collection_file);
853 QString id;
854 eng.documentsForIdentifier (id);
855 ]])],
856 octave_cv_func_qhelpengine_documentsforidentifier=yes,
857 octave_cv_func_qhelpengine_documentsforidentifier=no)
858 CPPFLAGS="$ac_octave_save_CPPFLAGS"
859 CXXFLAGS="$ac_octave_save_CXXFLAGS"
860 AC_LANG_POP(C++)
861 ])
862 if test $octave_cv_func_qhelpengine_documentsforidentifier = yes; then
863 AC_DEFINE(HAVE_QHELPENGINE_DOCUMENTSFORIDENTIFIER, 1,
864 [Define to 1 if you have the `QHelpEngine::documentsForIdentifier' member function.])
830 fi 865 fi
831 ]) 866 ])
832 dnl 867 dnl
833 dnl Check whether the Qt class QWheelEvent has the angleDelta member function. 868 dnl Check whether the Qt class QWheelEvent has the angleDelta member function.
834 dnl This member function was introduced in Qt 5. 869 dnl This member function was introduced in Qt 5.
2462 OCTAVE_CHECK_FUNC_QMOUSEEVENT_LOCALPOS 2497 OCTAVE_CHECK_FUNC_QMOUSEEVENT_LOCALPOS
2463 OCTAVE_CHECK_FUNC_QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS 2498 OCTAVE_CHECK_FUNC_QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS
2464 OCTAVE_CHECK_FUNC_QSCREEN_DEVICEPIXELRATIO 2499 OCTAVE_CHECK_FUNC_QSCREEN_DEVICEPIXELRATIO
2465 OCTAVE_CHECK_FUNC_QTABWIDGET_SETMOVABLE 2500 OCTAVE_CHECK_FUNC_QTABWIDGET_SETMOVABLE
2466 OCTAVE_CHECK_FUNC_QTMESSAGEHANDLER_ACCEPTS_QMESSAGELOGCONTEXT 2501 OCTAVE_CHECK_FUNC_QTMESSAGEHANDLER_ACCEPTS_QMESSAGELOGCONTEXT
2502 OCTAVE_CHECK_FUNC_QHELPENGINE_DOCUMENTSFORIDENTIFIER
2467 OCTAVE_CHECK_FUNC_QWHEELEVENT_ANGLEDELTA 2503 OCTAVE_CHECK_FUNC_QWHEELEVENT_ANGLEDELTA
2468 OCTAVE_CHECK_FUNC_QWHEELEVENT_POSITION 2504 OCTAVE_CHECK_FUNC_QWHEELEVENT_POSITION
2469 OCTAVE_CHECK_MEMBER_QFONT_FORCE_INTEGER_METRICS 2505 OCTAVE_CHECK_MEMBER_QFONT_FORCE_INTEGER_METRICS
2470 OCTAVE_CHECK_MEMBER_QFONT_MONOSPACE 2506 OCTAVE_CHECK_MEMBER_QFONT_MONOSPACE
2471 OCTAVE_HAVE_QGUIAPPLICATION 2507 OCTAVE_HAVE_QGUIAPPLICATION