Mercurial > octave
diff m4/acinclude.m4 @ 28835:2735fb9007e9 stable
avoid QList deprecated function warnings
* libgui/src/qt-utils.h: New file.
* libgui/src/module.mk: Update.
* qt-interpreter-events.cc: Avoid deprecated QList<T>::fromStdList and
QList<T>::toStdList functions.
* acinclude.m4 (OCTAVE_CHECK_FUNC_QLIST_ITERATOR_CONSTRUCTOR): New macro.
(OCTAVE_CHECK_QT_VERSION): Use it.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 13 Jul 2020 14:57:22 -0400 |
| parents | 9e7b2625e574 |
| children | 50c112129700 |
line wrap: on
line diff
--- a/m4/acinclude.m4 Wed Sep 30 08:45:42 2020 +0200 +++ b/m4/acinclude.m4 Mon Jul 13 14:57:22 2020 -0400 @@ -867,6 +867,35 @@ fi ]) dnl +dnl Check whether the Qt class QList has a constructor that accepts +dnl a pair of iterators. This constructor was introduced in Qt 5.14. +dnl +AC_DEFUN([OCTAVE_CHECK_FUNC_QLIST_ITERATOR_CONSTRUCTOR], [ + AC_CACHE_CHECK([for QList<T>::QList (iterator, iterator) constructor], + [octave_cv_func_qlist_iterator_constructor], + [AC_LANG_PUSH(C++) + ac_octave_save_CPPFLAGS="$CPPFLAGS" + ac_octave_save_CXXFLAGS="$CXXFLAGS" + CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" + CXXFLAGS="$CXXPICFLAG $CXXFLAGS" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include <QList> + ]], [[ + QList<int> lst_one; + QList<int> lst_two (lst_one.begin (), lst_one.end ()); + ]])], + octave_cv_func_qlist_iterator_constructor=yes, + octave_cv_func_qlist_iterator_constructor=no) + CPPFLAGS="$ac_octave_save_CPPFLAGS" + CXXFLAGS="$ac_octave_save_CXXFLAGS" + AC_LANG_POP(C++) + ]) + if test $octave_cv_func_qlist_iterator_constructor = yes; then + AC_DEFINE(HAVE_QLIST_ITERATOR_CONSTRUCTOR, 1, + [Define to 1 if you have the `QList<T>::QList (iterator, iterator)' constructor.]) + fi +]) +dnl dnl Check whether HDF5 library has version 1.6 API functions. dnl AC_DEFUN([OCTAVE_CHECK_HDF5_HAS_VER_16_API], [ @@ -2268,6 +2297,7 @@ OCTAVE_CHECK_FUNC_QHELPSEARCHQUERYWIDGET_SEARCHINPUT OCTAVE_CHECK_FUNC_QINSTALLMESSAGEHANDLER OCTAVE_CHECK_FUNC_QLINEEDIT_SETPLACEHOLDERTEXT + OCTAVE_CHECK_FUNC_QLIST_ITERATOR_CONSTRUCTOR OCTAVE_CHECK_FUNC_QMOUSEEVENT_LOCALPOS OCTAVE_CHECK_FUNC_QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS OCTAVE_CHECK_FUNC_QSCREEN_DEVICEPIXELRATIO