Mercurial > octave

diff libgui/src/resource-manager.cc @ 24827:1e0718c1867c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate most Qt version checks * acinclude.m4 (OCTAVE_CHECK_FUNC_QHEADERVIEW_SETSECTIONRESIZEMODE, OCTAVE_CHECK_FUNC_QHEADERVIEW_SETSECTIONSCLICKABLE, OCTAVE_CHECK_FUNC_QHEADERVIEW_SETSECTIONSMOVABLE, OCTAVE_CHECK_FUNC_QINSTALLMESSAGEHANDLER, OCTAVE_CHECK_FUNC_QMOUSEEVENT_LOCALPOS, OCTAVE_CHECK_FUNC_QTMESSAGEHANDLER_ACCEPTS_QMESSAGELOGCONTEXT): New macros. (OCTAVE_CHECK_QT_VERSION): Use them. Check for QStandardPaths header. * Canvas.cc, find-files-dialog.cc, file-editor-tab.cc, octave-gui.cc, resource-manager.cc, shortcut-manager.cc, variable-editor.cc, workspace-view.cc: Use new macros instead of checking Qt version.
author John W. Eaton <jwe@octave.org>
date Fri, 02 Mar 2018 13:25:34 -0500
parents ea1c88bd4430
children 6652d3823428
line wrap: on
line diff
--- a/libgui/src/resource-manager.cc	Fri Mar 02 10:45:06 2018 -0800
+++ b/libgui/src/resource-manager.cc	Fri Mar 02 13:25:34 2018 -0500
@@ -31,7 +31,7 @@
 #include <QNetworkProxy>
 #include <QLibraryInfo>
 #include <QMessageBox>
-#if defined (HAVE_QT5)
+#if defined (HAVE_QSTANDARDPATHS)
 #  include <QStandardPaths>
 #endif
 #include <QTextCodec>
@@ -69,12 +69,12 @@
     : m_settings_directory (), m_settings_file (), m_settings (nullptr),
       m_default_settings (nullptr)
   {
-#if defined (HAVE_QT4)
+#if defined (HAVE_QSTANDARDPATHS)
+    QString home_path
+      = QStandardPaths::writableLocation (QStandardPaths::HomeLocation);
+#else
     QString home_path
       = QDesktopServices::storageLocation (QDesktopServices::HomeLocation);
-#else
-    QString home_path
-      = QStandardPaths::writableLocation (QStandardPaths::HomeLocation);
 #endif
 
     m_settings_directory = home_path + "/.config/octave";