Mercurial > octave

comparison m4/acinclude.m4 @ 31748:90a741992f3f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
assume QGuiApplication::setDesktopFileName is available * acinclude.m4 (OCTAVE_CHECK_FUNC_QGUIAPPLICATION_SETDESKTOPFILENAME): Delete. (OCTAVE_CHECK_QT_VERSION): Delete use. * main-window.cc: Don't check HAVE_QGUIAPPLICATION_SETDESKTOPFILENAME. Delete code to work around absence of QGuiApplication::setDesktopFileName.
author John W. Eaton <jwe@octave.org>
date Tue, 17 Jan 2023 10:04:19 -0500
parents 2f730c070d3e
children 0668557b8f30
comparison
equal deleted inserted replaced
31747:2f730c070d3e 31748:90a741992f3f
516 AC_LANG_POP(C++) 516 AC_LANG_POP(C++)
517 ]) 517 ])
518 if test $octave_cv_func_qfontmetrics_horizontal_advance = yes; then 518 if test $octave_cv_func_qfontmetrics_horizontal_advance = yes; then
519 AC_DEFINE(HAVE_QFONTMETRICS_HORIZONTAL_ADVANCE, 1, 519 AC_DEFINE(HAVE_QFONTMETRICS_HORIZONTAL_ADVANCE, 1,
520 [Define to 1 if you have the `QFontMetrics::horizontalAdvance' function.]) 520 [Define to 1 if you have the `QFontMetrics::horizontalAdvance' function.])
521 fi
522 ])
523 dnl
524 dnl Check whether the Qt QGuiApplication class has the setDesktopFileName
525 dnl static member function. This function was introduced in Qt 5.7.
526 dnl
527 dnl FIXME: Delete this entirely when we drop support for Qt 5.6 or older.
528 dnl
529 AC_DEFUN([OCTAVE_CHECK_FUNC_QGUIAPPLICATION_SETDESKTOPFILENAME], [
530 AC_CACHE_CHECK([for QGuiApplication::setDesktopFileName],
531 [octave_cv_func_qguiapplication_setdesktopfilename],
532 [AC_LANG_PUSH(C++)
533 ac_octave_save_CPPFLAGS="$CPPFLAGS"
534 ac_octave_save_CXXFLAGS="$CXXFLAGS"
535 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
536 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
537 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
538 #include <QGuiApplication>
539 ]], [[
540 QGuiApplication::setDesktopFileName ("com.example.Example.desktop");
541 ]])],
542 octave_cv_func_qguiapplication_setdesktopfilename=yes,
543 octave_cv_func_qguiapplication_setdesktopfilename=no)
544 CPPFLAGS="$ac_octave_save_CPPFLAGS"
545 CXXFLAGS="$ac_octave_save_CXXFLAGS"
546 AC_LANG_POP(C++)
547 ])
548 if test $octave_cv_func_qguiapplication_setdesktopfilename = yes; then
549 AC_DEFINE(HAVE_QGUIAPPLICATION_SETDESKTOPFILENAME, 1,
550 [Define to 1 if you have the `QGuiApplication::setDesktopFileName' member function.])
551 fi 521 fi
552 ]) 522 ])
553 dnl 523 dnl
554 dnl Check whether the Qt class QHelpEngine has the documentsForIdentifier 524 dnl Check whether the Qt class QHelpEngine has the documentsForIdentifier
555 dnl function. dnl This member function was introduced in Qt 5.15. 525 dnl function. dnl This member function was introduced in Qt 5.15.
2146 ## We don't need to unset cache variables for any of the remaining 2116 ## We don't need to unset cache variables for any of the remaining
2147 ## tests if they fail because we have already decided that the Qt 2117 ## tests if they fail because we have already decided that the Qt
2148 ## version that we are testing now will be the one used. 2118 ## version that we are testing now will be the one used.
2149 2119
2150 OCTAVE_CHECK_FUNC_QFONTMETRICS_HORIZONTAL_ADVANCE 2120 OCTAVE_CHECK_FUNC_QFONTMETRICS_HORIZONTAL_ADVANCE
2151 OCTAVE_CHECK_FUNC_QGUIAPPLICATION_SETDESKTOPFILENAME
2152 OCTAVE_CHECK_FUNC_QHELPSEARCHQUERYWIDGET_SEARCHINPUT 2121 OCTAVE_CHECK_FUNC_QHELPSEARCHQUERYWIDGET_SEARCHINPUT
2153 OCTAVE_CHECK_NEW_QHELPINDEXWIDGET_API 2122 OCTAVE_CHECK_NEW_QHELPINDEXWIDGET_API
2154 OCTAVE_CHECK_FUNC_QLIST_ITERATOR_CONSTRUCTOR 2123 OCTAVE_CHECK_FUNC_QLIST_ITERATOR_CONSTRUCTOR
2155 OCTAVE_CHECK_FUNC_QHELPENGINE_DOCUMENTSFORIDENTIFIER 2124 OCTAVE_CHECK_FUNC_QHELPENGINE_DOCUMENTSFORIDENTIFIER
2156 OCTAVE_CHECK_FUNC_QWHEELEVENT_POSITION 2125 OCTAVE_CHECK_FUNC_QWHEELEVENT_POSITION