Mercurial > octave
changeset 24823:53f68d0fb122
acinclude.m4: Keep macros in alphabetical order.
* acinclude.m4 (OCTAVE_HAVE_QGUIAPPLICATION): Place in alphabetical order in
list of macros.
* acinclude.m4 (OCTAVE_CHECK_FUNC_QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS):
Renamed from OCTAVE_QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS to preserve
naming conventions used in Autoconf. Also renamed autoconf cache variable to
octave_cv_func_qobject_findchildren_accepts_findchildoptions.
| author | Rik <rik@octave.org> |
|---|---|
| date | Fri, 02 Mar 2018 08:29:07 -0800 |
| parents | 92b015dca875 |
| children | cce5d2ea39ff |
| files | m4/acinclude.m4 |
| diffstat | 1 files changed, 65 insertions(+), 65 deletions(-) [+] |
line wrap: on
line diff
--- a/m4/acinclude.m4 Fri Mar 02 09:48:10 2018 -0500 +++ b/m4/acinclude.m4 Fri Mar 02 08:29:07 2018 -0800 @@ -416,6 +416,40 @@ fi ]) dnl +dnl Check whether QObject::findChildren accepts Qt::FindChildOptions +dnl argument. +dnl +dnl FIXME: Delete this entirely when we drop support for Qt 4. +dnl +AC_DEFUN([OCTAVE_CHECK_FUNC_QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS], [ + AC_CACHE_CHECK([whether QObject::findChildren accepts Qt::FindChildOptions], + [octave_cv_func_qobject_findchildren_accepts_findchildoptions], + [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> + #include <QObject> + #include <QWidget> + ]], [[ + QObject obj; + QList<QWidget *> widgets + = obj.findChildren<QWidget *> ("name", Qt::FindDirectChildrenOnly); + ]])], + octave_cv_func_qobject_findchildren_accepts_findchildoptions=yes, + octave_cv_func_qobject_findchildren_accepts_findchildoptions=no) + CPPFLAGS="$ac_octave_save_CPPFLAGS" + CXXFLAGS="$ac_octave_save_CXXFLAGS" + AC_LANG_POP(C++) + ]) + if test $octave_cv_func_findchildren_accepts_findchildoptions = yes; then + AC_DEFINE(QOBJECT_FINDCHILDREN_ACCEPTS_QFINDCHILDOPTIONS, 1, + [Define to 1 if 'QObject::findChildren' accepts 'Qt::FindChildOptions' argument.]) + fi +]) +dnl dnl Check whether the Qt class QTabWidget has the setMovable member function. dnl This member function was introduced in Qt 4.5. dnl @@ -1254,70 +1288,6 @@ fi ]) dnl -dnl Check whether the Qt class QGuiApplication exists. This class -dnl was introduced in Qt 5.0. -dnl -dnl FIXME: Delete this entirely when we drop support for Qt 4. -dnl -AC_DEFUN([OCTAVE_HAVE_QGUIAPPLICATION], [ - AC_CACHE_CHECK([for QGuiApplication], - [octave_cv_decl_qguiapplication], - [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 <QGuiApplication> - ]], [[ - QScreen *pscreen = QGuiApplication::primaryScreen (); - ]])], - octave_cv_decl_qguiapplication=yes, - octave_cv_decl_qguiapplication=no) - CPPFLAGS="$ac_octave_save_CPPFLAGS" - CXXFLAGS="$ac_octave_save_CXXFLAGS" - AC_LANG_POP(C++) - ]) - if test $octave_cv_decl_qguiapplication = yes; then - AC_DEFINE(HAVE_QGUIAPPLICATION, 1, - [Define to 1 if `QGuiApplication' class is available.]) - fi -]) -dnl -dnl Check whether QObject::findChildren accepts Qt::FindChildOptions -dnl argument. -dnl -dnl FIXME: Delete this entirely when we drop support for Qt 4. -dnl -AC_DEFUN([OCTAVE_QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS], [ - AC_CACHE_CHECK([whether QObject::findChildren accepts Qt::FindChildOptions], - [octave_cv_qobject_findchildren_accepts_findchildoptions], - [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> - #include <QObject> - #include <QWidget> - ]], [[ - QObject obj; - QList<QWidget *> widgets - = obj.findChildren<QWidget *> ("name", Qt::FindDirectChildrenOnly); - ]])], - octave_cv_qobject_findchildren_accepts_findchildoptions=yes, - octave_cv_qobject_findchildren_accepts_findchildoptions=no) - CPPFLAGS="$ac_octave_save_CPPFLAGS" - CXXFLAGS="$ac_octave_save_CXXFLAGS" - AC_LANG_POP(C++) - ]) - if test $octave_cv_qobject_findchildren_accepts_findchildoptions = yes; then - AC_DEFINE(QOBJECT_FINDCHILDREN_ACCEPTS_QFINDCHILDOPTIONS, 1, - [Define to 1 if `QObject::findChildren' accepts 'Qt::FindChildOptions' argument.]) - fi -]) -dnl dnl Check for the Qhull version. dnl AC_DEFUN([OCTAVE_CHECK_QHULL_VERSION], [ @@ -1839,7 +1809,7 @@ OCTAVE_CHECK_MEMBER_QFONT_FORCE_INTEGER_METRICS OCTAVE_CHECK_MEMBER_QFONT_MONOSPACE OCTAVE_HAVE_QGUIAPPLICATION - OCTAVE_QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS + OCTAVE_CHECK_FUNC_QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS if test -n "$OPENGL_LIBS"; then OCTAVE_CHECK_QT_OPENGL_OK([build_qt_graphics=yes], @@ -2273,6 +2243,36 @@ fi ]) dnl +dnl Check whether the Qt class QGuiApplication exists. +dnl This class was introduced in Qt 5.0. +dnl +dnl FIXME: Delete this entirely when we drop support for Qt 4. +dnl +AC_DEFUN([OCTAVE_HAVE_QGUIAPPLICATION], [ + AC_CACHE_CHECK([for QGuiApplication], + [octave_cv_decl_qguiapplication], + [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 <QGuiApplication> + ]], [[ + QScreen *pscreen = QGuiApplication::primaryScreen (); + ]])], + octave_cv_decl_qguiapplication=yes, + octave_cv_decl_qguiapplication=no) + CPPFLAGS="$ac_octave_save_CPPFLAGS" + CXXFLAGS="$ac_octave_save_CXXFLAGS" + AC_LANG_POP(C++) + ]) + if test $octave_cv_decl_qguiapplication = yes; then + AC_DEFINE(HAVE_QGUIAPPLICATION, 1, + [Define to 1 if `QGuiApplication' class is available.]) + fi +]) +dnl dnl Check for IEEE 754 data format. dnl AC_DEFUN([OCTAVE_IEEE754_DATA_FORMAT], [