Mercurial > octave

changeset 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
files libgui/src/main-window.cc m4/acinclude.m4
diffstat 2 files changed, 0 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/main-window.cc	Tue Jan 17 10:00:45 2023 -0500
+++ b/libgui/src/main-window.cc	Tue Jan 17 10:04:19 2023 -0500
@@ -158,9 +158,7 @@
 
     adopt_dock_widgets ();
 
-#if defined (HAVE_QGUIAPPLICATION_SETDESKTOPFILENAME)
     QGuiApplication::setDesktopFileName ("org.octave.Octave.desktop");
-#endif
 
     QApplication *qapp = m_octave_qobj.qapplication ();
 
--- a/m4/acinclude.m4	Tue Jan 17 10:00:45 2023 -0500
+++ b/m4/acinclude.m4	Tue Jan 17 10:04:19 2023 -0500
@@ -521,36 +521,6 @@
   fi
 ])
 dnl
-dnl Check whether the Qt QGuiApplication class has the setDesktopFileName
-dnl static member function.  This function was introduced in Qt 5.7.
-dnl
-dnl FIXME: Delete this entirely when we drop support for Qt 5.6 or older.
-dnl
-AC_DEFUN([OCTAVE_CHECK_FUNC_QGUIAPPLICATION_SETDESKTOPFILENAME], [
-  AC_CACHE_CHECK([for QGuiApplication::setDesktopFileName],
-    [octave_cv_func_qguiapplication_setdesktopfilename],
-    [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>
-        ]], [[
-        QGuiApplication::setDesktopFileName ("com.example.Example.desktop");
-        ]])],
-      octave_cv_func_qguiapplication_setdesktopfilename=yes,
-      octave_cv_func_qguiapplication_setdesktopfilename=no)
-    CPPFLAGS="$ac_octave_save_CPPFLAGS"
-    CXXFLAGS="$ac_octave_save_CXXFLAGS"
-    AC_LANG_POP(C++)
-  ])
-  if test $octave_cv_func_qguiapplication_setdesktopfilename = yes; then
-    AC_DEFINE(HAVE_QGUIAPPLICATION_SETDESKTOPFILENAME, 1,
-      [Define to 1 if you have the `QGuiApplication::setDesktopFileName' member function.])
-  fi
-])
-dnl
 dnl Check whether the Qt class QHelpEngine has the documentsForIdentifier
 dnl function.  dnl This member function was introduced in Qt 5.15.
 dnl
@@ -2148,7 +2118,6 @@
     ## version that we are testing now will be the one used.
 
     OCTAVE_CHECK_FUNC_QFONTMETRICS_HORIZONTAL_ADVANCE
-    OCTAVE_CHECK_FUNC_QGUIAPPLICATION_SETDESKTOPFILENAME
     OCTAVE_CHECK_FUNC_QHELPSEARCHQUERYWIDGET_SEARCHINPUT
     OCTAVE_CHECK_NEW_QHELPINDEXWIDGET_API
     OCTAVE_CHECK_FUNC_QLIST_ITERATOR_CONSTRUCTOR